From 892cb53733de3d8e097435501a8aee200595b661 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 22 Jan 2008 23:13:10 +0000 Subject: [PATCH] Update all PO files after RFE #1699883 --- Src/Languages/Brazilian.po | 2664 ++++++++++++++++++----------------- Src/Languages/Bulgarian.po | 2664 ++++++++++++++++++----------------- Src/Languages/Catalan.po | 2664 ++++++++++++++++++----------------- Src/Languages/ChineseSimplified.po | 2664 ++++++++++++++++++----------------- Src/Languages/ChineseTraditional.po | 2664 ++++++++++++++++++----------------- Src/Languages/Croatian.po | 2664 ++++++++++++++++++----------------- Src/Languages/Czech.po | 2664 ++++++++++++++++++----------------- Src/Languages/Danish.po | 2664 ++++++++++++++++++----------------- Src/Languages/Dutch.po | 2664 ++++++++++++++++++----------------- Src/Languages/French.po | 2664 ++++++++++++++++++----------------- Src/Languages/German.po | 2664 ++++++++++++++++++----------------- Src/Languages/Hungarian.po | 2664 ++++++++++++++++++----------------- Src/Languages/Italian.po | 2664 ++++++++++++++++++----------------- Src/Languages/Japanese.po | 2664 ++++++++++++++++++----------------- Src/Languages/Korean.po | 2664 ++++++++++++++++++----------------- Src/Languages/Norwegian.po | 2664 ++++++++++++++++++----------------- Src/Languages/Polish.po | 2664 ++++++++++++++++++----------------- Src/Languages/Portuguese.po | 2664 ++++++++++++++++++----------------- Src/Languages/Russian.po | 2664 ++++++++++++++++++----------------- Src/Languages/Slovak.po | 2664 ++++++++++++++++++----------------- Src/Languages/Spanish.po | 2664 ++++++++++++++++++----------------- Src/Languages/Swedish.po | 2664 ++++++++++++++++++----------------- Src/Languages/Turkish.po | 2664 ++++++++++++++++++----------------- 23 files changed, 30774 insertions(+), 30498 deletions(-) diff --git a/Src/Languages/Brazilian.po b/Src/Languages/Brazilian.po index 0a1bccc38..4cd834b27 100644 --- a/Src/Languages/Brazilian.po +++ b/Src/Languages/Brazilian.po @@ -71,7 +71,7 @@ msgstr "Cor&tar" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Copiar" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "Co&lar" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "" @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "" #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Arquivo" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "New\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -158,2448 +158,2455 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Sair" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "Opçõe&s..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "E&xibir" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Escolher &Fonte..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Usar F&onte Padrão" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "Barra de &Status" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Idioma..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "" #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "" #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "Ja&nela" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "Fechar" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Dividir &Horizontalmente" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Dividir &Verticalmente" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "Em &Cascata" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "A&juda" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Conteúdo...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "" #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "" #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 #, c-format -msgid "C&onfiguration..." +msgid "&Translations" msgstr "" #: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format -msgid "A&rchive Support disabled..." +msgid "C&onfiguration..." msgstr "" -#: Merge.rc:183 +#: Merge.rc:182 #: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:481 +#, c-format +msgid "A&rchive Support disabled..." +msgstr "" + +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "Licença Pública GNU..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&Sobre o WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "Atuali&zar\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Próxima diferença\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferença &anterior\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Primeira &Diferença\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferença Corre&nte\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Ultima Diferença\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar para a &Direita\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar para a &Esquerda\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "" -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "Sal&var\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "" -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfazer\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refazer\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Cor&tar\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "Co&lar\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Pr&ocurar...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Al&terar...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "E&xibir Espaços" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Location &Pane" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copy to Right and Advance\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copy to Left and Advance\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Copiar tudo para a Direita" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Copiar tudo para a Esquerda" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "" -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "" -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "" -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "" -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Sobre o WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Todos os direitos reservados." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visite o site do WinMerge!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Selecione Arquivos ou Diretórios..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Esquerda:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Procurar..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Direita:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Arquivos ou Diretórios a Comparar" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Salvar como..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Sistema de Versões" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "Sistema de &Versões:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Geral" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Posicionar a&utomaticamente na primeira diferença" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Desabilitar Splash Screen" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Idiomas" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Idiomas disponíveis:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Localizar" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Localizar:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Somente p&alavras iguais" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "&Diferenciar maiúsculas de minúsculas" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "&Expressão regular" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Direção" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "A&cima" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "A&baixo" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Próximo" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Localizar e Substituir" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "Somente &na seleção" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "Em todo &documento" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "&Todos" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Comentários" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expressões (uma por linha):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Diferença:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Diferença Selecionada:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Diálogo" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "Comparar e&spaços em branco" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "&Ignorar moficações nos espaços em branco" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Ignora t&odos espaços em branco" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar linhas em bran&co" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignorar &maísculas/minúsculas" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Destacar sintaxe" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "&Atualização automática" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulação" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "Tama&nho da tabulação:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" "need to restart session" msgstr "" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" "(You can always recall this message from help menu.)" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Idênticos" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041604e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Wender Cris de Souza Firmino & Noreuzis" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" "New Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2608,7 +2615,7 @@ msgstr "" "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2617,7 +2624,7 @@ msgstr "" "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2626,7 +2633,7 @@ msgstr "" "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2635,7 +2642,7 @@ msgstr "" "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2644,7 +2651,7 @@ msgstr "" "Alterar as configurações de impressão\n" "Configurar Página" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2653,7 +2660,7 @@ msgstr "" "Alterar a impressora e as configurações de impressão\n" "Configurar impressora" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2662,7 +2669,7 @@ msgstr "" "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2671,51 +2678,51 @@ msgstr "" "Visualizar impressão\n" "Visualizar Impressão" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" "Project file (Ctrl+J)" msgstr "" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2724,7 +2731,7 @@ msgstr "" "Exibe informações do programa, número da Versão e Copyright\n" "Sobre" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2733,9 +2740,6 @@ msgstr "" "Sair do programa; pede para salvar documentos\n" "Sair" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2749,11 +2753,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2762,7 +2769,7 @@ msgstr "" "Ativa o próximo painel\n" "Próximo Painel" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2771,7 +2778,7 @@ msgstr "" "Ativa o painel anterior\n" "Painel anterior" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2780,7 +2787,7 @@ msgstr "" "Abre outra janela para o documento ativo\n" "Nova Janela" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2789,7 +2796,7 @@ msgstr "" "Organiza os ícones no fundo da janela\n" "Organiza os ícones" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2798,7 +2805,7 @@ msgstr "" "Organiza as janelas de modo que elas se sobreponham\n" "Organiza em Cascata" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2807,7 +2814,7 @@ msgstr "" "Organiza as janelas de modo que elas não se sobreponham\n" "Organiza Horizontalmente" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2816,7 +2823,7 @@ msgstr "" "Organiza as janelas de modo que elas não se sobreponham\n" "Organiza Verticalmente" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2825,7 +2832,7 @@ msgstr "" "Divide a janela ativa em painéis\n" "Divide" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2834,7 +2841,7 @@ msgstr "" "Apaga o texto selecionado\n" "Apaga" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2843,7 +2850,7 @@ msgstr "" "Apaga tudo\n" "Apaga tudo" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2852,7 +2859,7 @@ msgstr "" "Copia o texto selecionado e põe na área de Transferência\n" "Copia" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2861,7 +2868,7 @@ msgstr "" "Recorta a seleção e põe na área de Transferência\n" "Recorta" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2870,7 +2877,7 @@ msgstr "" "Procura o texto especificado\n" "Procura" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2879,7 +2886,7 @@ msgstr "" "Insere conteúdo da área de Transferência\n" "Cola" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2888,7 +2895,7 @@ msgstr "" "Repete a última ação\n" "Repetir" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2897,7 +2904,7 @@ msgstr "" "Substitui o texto especificado por outro\n" "Substitui" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2906,7 +2913,7 @@ msgstr "" "Seleciona o documento inteiro\n" "Seleciona Tudo" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2915,7 +2922,7 @@ msgstr "" "Desfaz a última ação\n" "Desfaz" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2924,7 +2931,7 @@ msgstr "" "Refaz a última ação desfeita\n" "Refaz" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2933,7 +2940,7 @@ msgstr "" "Exibe ou esconde a barra de ferramentas\n" "Chavea Barra de Ferramentas" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2942,69 +2949,69 @@ msgstr "" "Exibe ou esconde a barra de status\n" "Chavea Barra de Status" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Altera o tamanho da janela" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Altera a posição da janela" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Reduz a janela a um ícone" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Aumenta o tamnho da janela ao máximo" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Ativa a próxima janela" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Ativa a janela anterior" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e pede para salvar os documentos" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Restaurar o tamanho normal da janela" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Ativar Lista de Tarefas" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Ativar esta janela" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3013,7 +3020,7 @@ msgstr "" "Fechar a visualização de impressão\n" "Cancelar Preview" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3025,175 +3032,175 @@ msgid "" "WinMerge Document" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Versão %1 - Portuguès" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Opções (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Alterações foram feitas no arquivo corrente nesta sessão de comparação. Alguns ajustes podem não acontecer até que a comparação ao atual arquivo seja reiniciada." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A alteração da fonte não será aplicada a nenhuma das janelas que já estejam abertas." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3201,7 +3208,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3209,107 +3216,107 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos Arquivos (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1950 +#: Merge.rc:1953 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3318,7 +3325,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3327,7 +3334,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3335,7 +3342,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3344,12 +3351,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3357,208 +3364,208 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "Camin&ho para o cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "Ca&minho para o SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Comparação dos Diretórios" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Comparação de Arquivo" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Explorando arquivos..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Abrindo seleção" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Copiando da esquerda para direita" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Copiando da direita para esquerda" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Copiando tudo para esquerda" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Copiando tudo para direita" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "" -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "" -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Diferença %1 de %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferenças encontradas" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 Diferença encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione dois diretórios ou arquivos existentes para comparar" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Directory Selection" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Select two directories or two files to compare." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Cannot compare file and directory!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Arquivo não encontrado: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3567,7 +3574,7 @@ msgid "" "are identical binary files." msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3576,7 +3583,7 @@ msgid "" "are different binary files." msgstr "" -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3584,7 +3591,7 @@ msgid "" "is binary file. Cannot compare binary and text files." msgstr "" -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3593,37 +3600,37 @@ msgid "" "%2" msgstr "" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Salvar alterações em %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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 somente-leitura. Você gostaria de salvar suas alterações com um nome de diferente?" -#: Merge.rc:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Erro ao checar escrita no destino" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Erro ao realizar cópia de segurança do arquivo" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3632,7 +3639,7 @@ msgid "" "Continue anyway?" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3643,7 +3650,7 @@ msgid "" "\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3653,7 +3660,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3663,7 +3670,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3673,14 +3680,14 @@ msgid "" "Overwrite changed file?" msgstr "" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3690,17 +3697,17 @@ msgid "" "If you want to refresh files close current file compare and load files again." msgstr "" -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3708,42 +3715,42 @@ msgid "" "Refresh documents before continuing." msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Você precisa especificar o caminho de um projeto do SourceSafe para continuar (ex: $/MyProject)" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2108 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "O SourceSafe retornou um erro ao tentar efetuar check out no arquivo. Abortando..." -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar o comando do sistema de versões." -#: Merge.rc:2107 +#: Merge.rc:2110 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3751,186 +3758,186 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2114 #, 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Excluir o objeto selecionado a esquerda" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Excluir o objeto selecionado a direita" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Excluir o(s) arquivo(s) selecionado(s) em ambos os lados" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Você deseja realmente copiar TODAS diferenças para o arquivo da esquerda?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Você deseja realmente copiar TODAS diferenças para o arquivo da direita?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -3945,17 +3952,17 @@ msgstr "" "para\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Você tem certeza que deseja excluir %1 de %2 do(s) objecto(s) selecionado(s)?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -3966,7 +3973,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3977,17 +3984,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -3999,505 +4006,505 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Abrir arquivo a esquerda" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Abrir arquivo a esquerda com..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Abrir arquivo a direita" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Abrir o arquivo a direita com..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Nome de Arquivo" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Resultados da comparação" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Data da Esquerda" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Data da Direita" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Extensão" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Não foi possível comparar os arquivos" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Os arquivos binários são idênticos" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Os arquivos (binários) são diferentes" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Os arquivos são diferentes" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Os arquivos selecionados são idênticos." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocorreu um erro durante a comparação dos arquivos." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Arquivos binários não podem ser comparados visualmente." -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Os arquivos deste diretório, não podem ser comparados visualmente." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4507,7 +4514,7 @@ msgid "" "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4515,22 +4522,22 @@ msgid "" " Do you want to change the options and preserve the different EOL ?" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4538,132 +4545,132 @@ msgid "" "Would you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituindo %1 texto(s)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Não foi possível localizar \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4671,17 +4678,17 @@ msgid "" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4689,51 +4696,51 @@ msgid "" "See manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4741,1124 +4748,1124 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanês" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Árabe (Saudi Arabian)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Árabe (Iraq)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Árabe (Egyptian)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Árabe (Libyan)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Árabe (Algerian)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Árabe (Moroccan)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Árabe (Tunisian)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Árabe (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Árabe (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Árabe (Syrian)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Árabe (Jordan)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Árabe (Lebanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Árabe (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Árabe (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Árabe (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Árabe (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Arménio" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Búlgaro" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalão" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chinês (Traditional)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chinês (Simplified)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chinês (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chinês (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chinês (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Croata" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Checo" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Dinamarquês" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Holandês" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Holandês (Belgium)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Inglês (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Inglês (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Inglês (Australian)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Inglês (Canadian)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Inglês (New Zealand)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Inglês (Irish)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Inglês (So. African)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Inglês (Jamaican)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Inglês (Caribbean)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Inglês (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Inglês (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Inglês (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Inglês (Philippines)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Estónio" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Faroense" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Persa" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Finlandês" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Francês" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Francês (Belgique)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Francês (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Francês (Switzerland)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Francês (Luxembourg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Francês (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgiano" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Alemão (Germany)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Alemão (Switzerland)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Alemão (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Alemão (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Alemão (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Grego (Moderno)" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebraico" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Húngaro" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Islandês" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italiano" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italiano (Swiss)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japonês" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Coreano" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Coreano (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Letão" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lituano" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norueguês (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norueguês (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polish" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Português" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Português (do Brasil)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Romeno" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russo" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Eslovaco" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Esloveno" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Espanhol" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Espanhol (Mexican)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Espanhol (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Espanhol (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Espanhol (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Espanhol (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Espanhol (Dominican)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Espanhol (da Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Espanhol (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Espanhol (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Espanhol (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Espanhol (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Espanhol (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Espanhol (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Espanhol (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Espanhol (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Espanhol (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Espanhol (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Espanhol (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Espanhol (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Sueco" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Sueco (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Tailandês" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turco" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ucraniano" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamita" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" "Go to (Ctrl+G)" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5867,7 +5874,7 @@ msgstr "" "Opções do Programa\n" "Options" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -5876,113 +5883,113 @@ msgstr "" "Atualizar tela\n" "Atualizar (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" "Select View Font" msgstr "" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" "Default Font" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Exibir caracteres de espaço em branco" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -5991,50 +5998,50 @@ msgstr "" "Seleciona o Idioma usado na interface\n" "Língua" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" "Show Line Diff" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6043,7 +6050,7 @@ msgstr "" "Posiciona na diferença anterior\n" "Diferença Anterior (Shift+Tab)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6052,7 +6059,7 @@ msgstr "" "Posiciona na próxima diferença\n" "Próxima Diferença (Tab)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6061,7 +6068,7 @@ msgstr "" "Ir para a Primeira Diferença\n" "First Diff (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6070,7 +6077,7 @@ msgstr "" "Ir para a Diferença Corrente\n" "Current Diff (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6079,7 +6086,7 @@ msgstr "" "Ir para a Última Diferença\n" "Last Diff (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6088,7 +6095,7 @@ msgstr "" "Copia o texto selecionado para o arquivo da direita\n" "Copiar à Direita (Right Arrow)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6097,21 +6104,21 @@ msgstr "" "Copia o texto selecionado para o arquivo da esquerda\n" "Copiar à Esquerda (Left Arrow)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" "Copy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" "Copy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6120,7 +6127,7 @@ msgstr "" "Copiar todas as diferenças para o arquivo da direita\n" "Todos para a Direita" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6129,84 +6136,84 @@ msgstr "" "Copiar todas as diferenças para o arquivo da esquerda\n" "Todos para a Esquerda" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" "Active next File" msgstr "" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6215,296 +6222,301 @@ msgstr "" "Exibe o Guia do Usuário do WinMerge\n" "Ajuda" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Exibe a Licença Pública GNU" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" "Help Index" msgstr "" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" "Help Search" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Bulgarian.po b/Src/Languages/Bulgarian.po index 7329b814f..9210aa27d 100644 --- a/Src/Languages/Bulgarian.po +++ b/Src/Languages/Bulgarian.po @@ -72,7 +72,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Êîïèðàé" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "Ïî&ñòàâè" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "Îòèäè &íà..." @@ -95,43 +95,43 @@ msgid "Op&en" msgstr "&Îòâîðè" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "ñ &Ðåãèñòðèðàíî Ïðèëîæåíèå" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "ñ &Âúíøåí Ðåäàêòîð" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&ñúñ..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Ôàéë" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Íîâ\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Îòâîðè...\tCtrl+O" @@ -147,8 +147,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Îòâîðè &Ïðîåêò...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "&Çàïèøè Ïðîåêò..." @@ -159,1845 +159,1852 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Èçõîä" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Ðåäàêòèðàíå" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Íàñòðîéêè..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "È&çãëåä" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Èçáåðè &øðèôò..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Èçïîëçâàé ø&ðèôò ïî ïîäðàçáèðàíå" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "&Ëåíòà íà ñúñòîÿíèåòî" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Åçèê..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Èíñòðóìåíòè" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Ôèëòðè..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Ñúçäàé ïà÷..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Äîáàâêè" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "&Ðú÷íî ðàçàðõèâèðàíå" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Àâòîìàòè÷íî ðàçàðõèâèðàíå" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Ðåäàêòèðàé ñ ðàçàðõèâàòîðà" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Ïðåçàðåäè äîáàâêèòå" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "&Çàðåäè Êîíôèãóðàöèÿ..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Ïðîçîðöè" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Çàòâîðè" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Çàòâîðè &âñè÷êè" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Ñìåíè &ëèñòà\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Ïîäðåäè &õîðèçîíòàëíî" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Ïîäðåäè &âåðòèêàëíî" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "Ïîäðåäè &êàñêàäíî" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Ïîìîù" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Ñúäúðæàíèå...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Èíäåêñ..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Òúðñåíå..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "&Íàñòðîèêè..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Çàáðàíåíà ïîääðúæêà íà &àðõèâè..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "&Îáùåñòâåí GNU ëèöåíç..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&Çà WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Îòâîðè &Ïðîåêò...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Î&ò ëÿâî ñàìî çà ÷åòåíå" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Îò äÿñ&íî ñàìî çà ÷åòåíå" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "&Êîäèðàíå íà ôàéëà" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Èçáåðè &âñè÷êî\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Ïîêàæè &Åäíàêâèòå íåùà" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Ïîêàæè &Ðàçëè÷íèòå íåùà" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Ïîêàæè &Ëåâèòå óíèêàëíè íåùà" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Ïîêàæè &Äåñíèòå Óíèêàëíè íåùà" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Ïîêàæè &Ïðîïóñíàòèòå íåùà" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Ïîêàæè Äâ&îè÷íèòå ôàéëîâå" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Ïîêàæè &Ñêðèòèòå íåùà" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Ñòàòèñòèêà íà ñðàâíÿâàíåòî" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Îáíîâè\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Îáíîâè &èçáðàíîòî\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Ñðàâíÿâàíå" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Ñðà&âíè\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Ñëåäâàùà ðàçëèêà\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Ïðåäèøíà ðàçëèêà\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Ï&úðâà ðàçëèêà\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Òåêóùà ðàçëèêà\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Ïî&ñëåäíà ðàçëèêà\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Êîïèðàé â &äÿñíî\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Êîïèðàé â ë&ÿâî\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Èçòðèé\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Íàãëàñè êîëîíèòå..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Ñúçäàé &Îò÷åò..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Çàïèøè\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Çàïèøè &ëÿâàòà ÷àñò" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Çàïèøè" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Çàïèøè &êàòî..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Çàïèøè &äÿñíàòà ÷àñò" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Ïðèíòèðàíå..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "Ï&ðåãëåä" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Ôîðìàò çà" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Ðåæèì íà ñëèâàíå\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Îòìåíè\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Âú&ðíè\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Èçðåæè\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Êîïèðàé\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "Ïî&ñòàâè\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Èçáåðè &ðàçëè÷íèòå ðåäîâå\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Í&àìåðè...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Çàìåñ&òè...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Ñêðèïòîâå" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Ïðàçåí >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Äîïúëíèòåëíè" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Êîïèðàé ñ íîìåðàòà íà ðåäîâåòå\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Îòìåòêè" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Ïðèêðåïè îòìåòêà\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Ñëåäâàùà îòìåòêà\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Ï&ðåäèøíà îòìåòêà\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Èç÷èñòè âñè÷êè îòìåòêè" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Îò&èäè íà...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "&Ïîêàæè ïðàçíèòå ìåñòà" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Ïîêàæè ðàçëè÷íèòå ðåäîâå" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Ïîêàæè íîìåðà íà ðåäîâåòå" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "Îòðåæè äúëãèòå ðåäîâå" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "Ðàçìåíè ëèñòîâåòå" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Ëèñò ñ &ðàçëè÷èÿòà" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Íàâèãàòîð" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Ê&îïèðàé â äÿñíî è ñå ïðåìåñòè\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Êîïèðàé &â ëÿâî è ñå ïðåìåñòè\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Êîïèðàé &âñè÷êî â äÿñíî" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Êîïèðà&é âñè÷êî â ëÿâî" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Íàëè÷íè" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "&Ñðàâíè" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "Îò &ëÿâî êúì äÿñíî" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "Îò ëÿâ&î êúì..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "Îò &äÿñíî êúì ëÿâî" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "Îò ä&ÿñíî êúì..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Ïðåìåñòè" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "Îò &ëÿâî êúì..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "Îò &äÿñíî êúì..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Èçòðèé" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Îò ëÿâî" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Îò äÿñíî" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Äâåòå" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "&Ïðåèìåíóâàé" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "&Ñêðèé" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "&Îòâîðè â ëÿâî" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Î&òâîðè â äÿñíî" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Êîïèðàé &ïúòÿ" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Ëÿâî (%1 îò %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Äÿñíî (%1 îò %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "Ä&âåòå (%1 îò %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Êîïèðàé &ôàéëîâèòå èìåíà" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "&Çèï" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Ëÿâî... (%1 îò %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Äÿñíî... (%1 îò %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "Ä&âåòå... (%1 îò %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Ðàçëèêè... (%1 îò %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "&Îáíîâè" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "&Êîïèðàé ïúòÿ" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Êîïèðàé &èìåòî" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Íàëè÷íè íàñòðîéêè" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Áåç íàëè÷íè" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "&Àâòîìàòè÷íè" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "&Îòèäè íà ðàçëèêà" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Áåç ïðåìåñòåíè áëîêîâå" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Âñè÷êè ïðåìåñòåíè áëîêîâå" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Ïðåìåñòåí áëîê çà &òåêóùà ðàçëèêà" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Çà WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Âñè÷êè ïðàâà çàïàçåíè." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Ïîñåòè ñòðàíèöàòà íà WinMerge!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "ÎÊ" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Äàðèòåëè" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Èçáåðè Ôàéë èëè äèðåêòîðèÿ..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "Îò &ëÿâî:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Ïîòúðñè..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "Îò &äÿñíî:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "Ïî&òúðñè..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Ôèëòúð:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Èçáåðè..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "&Ðàçàðõèâèòîð:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Èçáåðè..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Âêëþ÷èòåëíî ïîäïàïêèòå" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Ñòàòóñ:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Îòìåíè" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Ïîìîù" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Ôàéëîâå èëè äèðåêòîðèè çà ñðàâíÿâàíå" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Áàçà äàííè:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Ïðîåêò:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Ïîòðåáèòåë:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Ïàðîëà:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Âðúçêà ñ VSS ïðîåêò" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Çàäàé çà âñè÷êè" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Äåéñòâàé" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Çàïèøè êàòî..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ïúò äî cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Îñíîâíè" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Àâòîìàòè÷íî &ïðèäâèæâàíå êúì ïúðâàòà ðàçëèêà" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Çàáðàíè íà÷àëíèÿ ïðîçîðåö" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Çàòâîðè &ïðîçîðöèòå ïðè ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Àâòîìàòè÷íî ïðîâåðè ïúòèùàòà â äèàëîãà Îòâîðè" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "Ïîçâîëè ñàìî &åäíî ñòàðòèðàíî êîïèå" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Ïîçâîëè ìíîãî ïðîçîðöè çà ñðàâíÿâàíå çà" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Ñðàâíÿâàíå íà &Ïàïêè" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Ñðàâíÿâàíå íà &Ôàéëîâå" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge ïîçâîëÿâà ñêðèâàíå íà íÿêîè ñúîáùåíèÿ. Íàòèñíåòå áóòîíà Âúçñòàíîâè, çà äà ïîêàæåòå ïàê òåçè ñúîáùåíèÿ." -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Âúçñòàíîâè" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Åçèê" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Íàëè÷íè åçèöè:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Íàìåðè" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Òúðñè çà:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Òúðñè &ñàìî öåëè äóìè" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Ãëàâíè/ìàëêè áóêâè" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "Ïðàâèëíè &èçðàçè" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "Äî êðàÿ íà ôàéëà" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Ïîñîêà" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Íàãîðå" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "Íà&äîëó" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Íàìåðè" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Çàìåíè" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "&Çàìåíè ñ:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "Äî êðàÿ íà ôàéëà" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Çàìåíè â" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Èçáðàíîòî" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr " &öåëèÿ ôàéë" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Çàìåíè" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Çàì. &âñè÷êî" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "Äåéñòâàé" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Êîìåíòàðè" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Ôèëòðè çà ðåä" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ïðàâèëíè èçðàçè (ïî åäèí íà ðåä):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Öâåòîâå" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Ðàçëèêè:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Èçáðàíè ðàçëèêè:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Ôîí" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Èçòðèòè" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Òåêñò" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Èãíîðèðàíè ðàçëèêè:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Ïðåìåñòåíè:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Èçáðàíè è ïðåìåñòåíè:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Ðàçëèêè â äóìèòå:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr " èçáðàíèòå äóìè:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Âúçñòàíîâè" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Äèàëîã" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Ñèñòåìíè" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Ñëîæè èçòðèòèòå ôàéëîâå â Êîø÷åòî" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Èãíîðèðàé âðåìåâèòå ðàçëèêè ïî-ìàëêè îò 3 ñåêóíäè" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Èíòåãðàöèÿ" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Äîáàâè êúì ìåíþòî íà Åêñïëîðåðà" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Ïîçâîëè &äîïúëíèòåëíî ìåíþ" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "Âêëþ÷èòåëíî ïîäïàïêèòå" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Âúíøåí ðåäàêòîð:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "&Ïàïêà íà ôèëòðèòå:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Ïîòúðñè..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Ãåíåðèðàíå íà ïà÷" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Ôàéë&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Ôàéë&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Ï&îòúðñè..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "&Ðàçìåíè" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "&Ïðèëîæè êúì ñúùåñòâóâàù ôàéë" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Ðåçóëòàò:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "&Ôîðìàò" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "Ñòè&ë:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Êîíòåêñò:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Ïðàçí&è ìåñòà" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "Ñðàâ&íè" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "È&ãíîðèðàé ïðîìåíèòå" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Èã&íîðèðàé âñè÷êî" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Èãíîðèðà&é ïðàçíèòå ëèíèè" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Ãîëåìè/ìàëêè áóêâè" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Âêëþ÷èòåëíî êîìàíäíèÿ ðåä" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Îòâîðè ñ âúíøå&í ðåäàêòîð" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Ïîêàæè êîëîíèòå" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Èçáåðè ðàçàðõèâàòîð" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Ôàéëîâ ðàçàðõèâàòîð:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Ïîêàçâàé âñè÷êè ðàçàðõèâàòîðè, íå ïðîâåðÿâàé ðàçøèðåíèÿòà" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Ñïèñúê íà ðàçøèðåíèÿòà:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Îïèñàíèå:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "Ñðàâíÿâàíå íà ïàïêè" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Ñïðè" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Ñðàâíÿâàíå íà..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Ñðàâíåíè:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Âñè÷êî:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Îòèäè íà" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "&Îòèäè íà:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Ôàéë" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Îòèäè íà:" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "Ðå&ä" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Ðàçëèêà" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Îòèäè" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Ñðàâíÿâàíå" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Ïðàçíè ìåñòà" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "&Ñðàâíÿâàíå" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "&Èãíîðèðàé ïðîìåíèòå" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "È&ãíîðèðàé âñè÷êî" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Èãíîðèðàé ïðà&çíèòå ëèíèè" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Èãíîðèðàé &Ãîëåìè/ìàëêè áóêâè" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Ïîçâîëè ðàçïîçíàâàíå íà ïðåìåñòåí &áëîê" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Ìåòîä çà ñðàâíåíèå:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "&Ñïðè ñëåä ïúðâàòà ðàçëèêà" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Ôèëòúð çà êîìåíòàðè" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Ðåäàêòîð" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "&Ïîä÷åðòàâàé ñèíòàêñèñà" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "&Àâòîìàòè÷íî ñêàíèðàíå" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "&Çàïàçè îðèãèíàëíèòå EOL âèôúð" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Òàáóëàöèÿ" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Ãîëåìèíà íà òàáóëàöèÿòà:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "&Ñëîæè òàáóëàöèÿ" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Ñëîæè &ðàçñòîÿíèÿ" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Îöâåòÿâàé ðåäîâåòå ñ ðàçëèêè" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Ïîêàçâàé ðàçëèêèòå â ðåäà" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "Íèâî &ñèìâîë" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "Íèâî &äóìà:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Ôàéëîâè ôèëòðè" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Òåñòâàé" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Èíñòàëèðàé..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Íîâ..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Ðåäàêòèðàé..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Èçòðèé..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Çàïèñ íà ïðîìåíåíè ôàéëîâå?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Ëÿâ ôàéë" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Çàïèøè ïðîìåíèòå" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Îòìåíè ïðîìåíèòå" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Äåñåí ôàéë" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "Ç&àïèøè ïðîìåíèòå" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Î&òìåíè ïðîìåíèòå" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Îòìåíè âñè÷êè" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Êîäèðîâêà" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Ñòàíäàðòíà êîäèðîâêà" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Èçáåðåòå ñòàíäàðòíà êîäèðîâêà çà íå-Unicode ôàéëîâå:" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2006,32 +2013,32 @@ msgstr "" "Çàñå÷è êîäèðîâêàòà çà ñëåäíèòå ôàéëîâå : .html, .rc, .xml \n" "èçèñêâà ðåñòàðòèðàíå íà ñåñèÿòà" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Êîäèðîâêà íà ñèñòåìàòà" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Ñïîðåä èíòåðôåéñà íà WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Ïîòðåáèòåëñêà êîäèðîâêà :" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Çàáðàíåíà ïîääðúæêà íà àðõèâè" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Íå å çàñå÷åíà âåðñèÿ íà 7-Zip (íå å èíñòàëèðàíà?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2040,12 +2047,12 @@ msgstr "" "Ïîääðúæêàòà íà àðõèâè èçèñêâà 7-Zip 3.11 èëè ïî-íîâ èíñòàëèðàí íà Âàøèÿ êîìïþòúð, èëè íåãîâèòå \n" "âàæíè êîìïîíåíòè äà áúäàò êîïèðàíè â ïðîãðàìíàòà ïàïêà çà íåçàâèñèìè îïåðàöèè." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Òðÿáâà äà èìà ïîäõîäÿùà äîáàâêà (Merge7z*.dll) â ïúòÿ." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2054,12 +2061,12 @@ msgstr "" "Ìîëÿ èçïîëçâàéòå ïðåïîðú÷èòåëíàòà îòäîëó âåðñèÿ íà 7-Zip äîêàòî èçëåçå äîáàâêàòà\n" "çà ïîñëåäíàòà âåðñèÿ." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Âåðñèÿ" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2068,54 +2075,54 @@ msgstr "" "Íåîáõîäèìà äîáàâêà\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Ïðåïîðú÷èòåëíà âåðñèÿ íà 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "íàëè÷íà" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip èíñòàëèðàí íà âàøèÿ êîìïþòúð:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "íÿìà" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "ëèïñâà" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip êîìïîíåíò çà íåçàâèñèìè äåéñòâèÿ:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "îñòàðÿë" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Ïúò íà äîáàâêà:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2124,486 +2131,486 @@ msgstr "" "Íå ïîêàçâàé îòíîâî òîâà ñúîáùåíèå.\n" "(Âèå ìîæåòå äà èçâèêàòå òîâà ñúîáùåíèå îò ìåíþ Ïîìîù.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Ñâàëè äîáàâêè" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Íàñòðîéêè" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Êàòåãîðèè" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Èìïîðò..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Åêñïîðò..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Êëþ÷îâè äóìè:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Èìåíà íà ôóíêöèè:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Êîìåíòàðè:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "×èñëà:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Îïåðàòîðè:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Ñòðèíãîâå:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Ïðåäïðîöåñîð:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Ïîòðåáèòåë 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Ïîòðåáèòåë 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Óäåáåëåí" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Îò÷åò çà ñðàâíÿâàíå íà ïàïêè" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "Ôàéë:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Ñòèë:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Êîïèðàé â êëèïáîðäà" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Ñïîäåëåí èëè ñîáñòâåí ôèëòúð" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Êîé òèï ôèëòúð èñêàòå äà ñúçäàäåòå?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Ñïîäåëåí ôèëòúð (çà âñè÷êè ïîòðåáèòåëè íà òîçè êîìïþòúð)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Ñîáñòâåí ôèëòúð (ñàìî çà òåêóùèÿ ïîòðåáèòåë)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Ïîääðúæêà íà àðõèâè" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Ïîääðúæêàòà íà àðõèâè èçèñêâà èíñòàëèðàíà 7-Zip äîáàâêà:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Ñâàëè 7-zip äîáàâêà" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Ïîçâîëè ïîääðúæêà íà àðõèâè" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Èçïîëçâàé îòäåëåí 7-Zip àêî å íà ëèöå" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "Èçïîëçâàé ëîêàëåí 7-Zip îò ïàïêàòà íà WinMerge" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Çàñå÷è àðõèâà îò ôàéëîâàòà ñèãíàòóðà" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Ñòàòèñòèêà çà ñðàâíÿâàíå" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Ïàïêè:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Ôàéëà:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Ðàçëè÷íè" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Òåêñò:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Äâîè÷íè:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Óíèêàëíè" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Ëÿâî:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Äÿñíî:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Èäåíòè÷íè" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Îáùî:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Çàòâîðè" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Èçáåðåòå êîäèðîâêà çà" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&Çàðåæäàíå íà ôàéë:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "Çàïèñâàíå íà ôàéë:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&Èçïîëçâàé åäíàêâà êîäèðîâêà è çà äâåòå" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "&Ïðèëîæè" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Îòìåíè" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Òåñò íà ôèëòúð" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Òåñòâàíå íà ôèëòúð ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Âúâåäåòå òåêñò çà òåñòâàíå:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Èìå íà ïàïêà" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Ðåçóëòàò:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "&Òåñòâàé" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Çàòâîðè" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&Èçïîëçâàé çàäàäåíè öâåòîâå çà òåêñòà" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Çàäàäåíè öâåòîâå íà òåêñò" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Áÿëî ïðîñòðàíñòâî:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Íîðìàëåí òåêñò:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Èçáðàí:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Ïúòèùà" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Ñàìî çà ÷åòåíå" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Ñàìî çà ÷åòåíå" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Îòâîðè..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Çàïèøè..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "040204e3" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by sld & Tigertron" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x402, 1251" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Ãîòîâ" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2612,7 +2619,7 @@ msgstr "" "Ñúçäàé íîâ äîêóìåíò\n" "Íîâ äîêóìåíò (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2621,7 +2628,7 @@ msgstr "" "Îòâîðè ñúùåñòâóâàù äîêóìåíò\n" "Îòâîðè (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2630,7 +2637,7 @@ msgstr "" "Çàòâîðè äåéñòâàùèÿ äîêóìåíò\n" "Çàòâîðè" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2639,7 +2646,7 @@ msgstr "" "Çàïèøè òåêóùèÿ äîêóìåíò\n" "Çàïèøè (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2648,7 +2655,7 @@ msgstr "" "Çàïèøè òåêóùèÿ äîêóìåíò ñ íîâî èìå\n" "Çàïèøè êàòî" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2657,7 +2664,7 @@ msgstr "" "Ïðîìåíè íàñòðîéêèòå íà ïðèíòåðà\n" "Íàñòðîéêè íà ñòðàíèöàòà" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2666,7 +2673,7 @@ msgstr "" "Ïðîìåíè íàñòðîéêèòå íà ïðèíòåðà è íàñòðîéêèòå çà ïðèíòèðàíå\n" "Íàñòðîéêè çà ïðèíòèðàíå" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2675,7 +2682,7 @@ msgstr "" "Ïðèíòèðàé òåêóùèÿ äîêóìåíò\n" "Ïðèíòèðàé" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2684,12 +2691,12 @@ msgstr "" "Âèæ ñòðàíèöàòà ïðåäè ïðèíòèðàíå\n" "Ïðåãëåä" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Íàïðàâè âñè÷êè ñêðèòè åëåìåíòè îòíîâî âèäèìè" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2698,32 +2705,32 @@ msgstr "" "Îòâîðè ôàéëîâ ïðîåêò\n" "Ôàéë ñ ïðîåêò (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåïîçíàòà ãðåøêà ïðè îòâàðÿíåòî íà ôàéëà ñ ïðîåêòà" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåïîçíàòà ãðåøêà ïðè çàïèñâàíåòî íà ôàéëà ñ ïðîåêòà" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Ïðîåêòîâ ôàéë" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Ïðîåêòîâèÿ ôàéë å çàðåäåí óñïåøíî." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Ïðîåêòîâèÿ ôàéë å çàïèñàí óñïåøíî." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2732,7 +2739,7 @@ msgstr "" "Çàïèøè òåêóùèòå ïúòèùà è íàñòðîéêè â ïðîåêòîâ ôàéë\n" "Çàïèøè ïðîåêòà âúâ ôàéë" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2741,7 +2748,7 @@ msgstr "" "Ïðåäñòàâÿ èíôîðìàöèÿ çà ïðîãðàìàòà, âåðñèÿòà è àâòîðñêîòî ïðàâî\n" "Çà" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2750,9 +2757,6 @@ msgstr "" "Èçëèçàíå îò ïðèëîæåíèåòî; íàïîìíÿíå äà çàïàçèòå äîêóìåíòà\n" "Èçõîä" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2766,11 +2770,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Îòâàðÿíå íà òîçè äîêóìåíò" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2779,7 +2786,7 @@ msgstr "" "Ïðåâêëþ÷è êúì ñëåäâàùèÿ ïðîçîðåö\n" "Ñëåäâàù ïðîçîðåö" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2788,7 +2795,7 @@ msgstr "" "Ïðåâêëþ÷è êúì ïðåäèøíèÿ ïðîçîðåö\n" "Ïðåäèøåí ïðîçîðåö" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2797,7 +2804,7 @@ msgstr "" "Îòâàðÿíå íà äðóã ïðîçîðåö çà òåêóùèÿ äîêóìåíò\n" "Íîâ ïðîçîðåö" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2806,7 +2813,7 @@ msgstr "" "Ïîäðåäè èêîíêèòå â îñíîâàòà íà ïðîçîðåöà\n" "Ïîäðåäè èêîíèòå" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2815,7 +2822,7 @@ msgstr "" "Ïîäðåæäà ïðîçîðöèòå êàñêàäíî\n" "Ïîäðåäè Êàñêàäíî" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2824,7 +2831,7 @@ msgstr "" "Ïîäðåæäà ïðîçîðöèòå áåç äà ñå ïîêðèâàò\n" "Ïîäðåäè ïðîçîðöèòå" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2833,7 +2840,7 @@ msgstr "" "Ïîäðåæäà ïðîçîðöèòå áåç äà ñå ïîêðèâàò\n" "Ïîäðåäè ïðîçîðöèòå" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2842,7 +2849,7 @@ msgstr "" "Ðàçäåëÿ òåêóùèÿ ïðîçîðåö\n" "Ðàçäåëè" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2851,7 +2858,7 @@ msgstr "" "Èçòðèâà èçáðàíîòî\n" "Èçòðèé" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2860,7 +2867,7 @@ msgstr "" "Èçòðèâà âñè÷êî\n" "Èçòðèé âñè÷êî" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2869,7 +2876,7 @@ msgstr "" "Êîïèðà èçáðàíîòî è ãî ñëàãà â Clipboard\n" "Êîïèðàé" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2878,7 +2885,7 @@ msgstr "" "Ðåæè èçáðàíîòî è ãî ñëàãà â Clipboard\n" "Èçðåæè" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2887,7 +2894,7 @@ msgstr "" "Òúðñè îïðåäåëåí òåêñò\n" "Òúðñè" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2896,7 +2903,7 @@ msgstr "" "Ñëîæè ñúäúðæàíèåòî íà Clipboard\n" "Ïîñòàâè" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2905,7 +2912,7 @@ msgstr "" "Ïîâòîðè ïîñëåäíîòî äåéñòâèå\n" "Ïîâòîðè" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2914,7 +2921,7 @@ msgstr "" "Çàìåñòè îïðåäåëåí òåêñò\n" "Çàìåñòè" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2923,7 +2930,7 @@ msgstr "" "Èçáåðè öåëèÿ äîêóìåíò\n" "Èçáåðè âñè÷êî" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2932,7 +2939,7 @@ msgstr "" "Îòìåíè ïîñëåäíîòî äåéñòâèå\n" "Îòìåíè (Ctrl+Z)" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2941,7 +2948,7 @@ msgstr "" "Âúðíè ïîñëåäíîòî äåéñòâèå\n" "Âúðíè (Ctrl+Y)" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2950,7 +2957,7 @@ msgstr "" "Ïîêàçâà èëè ñêðèâà èíñòðóìåíòèòå\n" "Ïîêàæè èíñòðóìåíòèòå" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2959,69 +2966,69 @@ msgstr "" "Ïîêàçâà èëè ñêðèâà ñòàòóñà\n" "Ñòàòóñ" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Ïðîìåíè ãîëåìèíàòà íà ïðîçîðåöà" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Ïðîìåíè ìÿñòîòî íà ïðîçîðåöà" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Íàïðàâè ïðîçîðåöà íà èêîíà" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Óâåëè÷è ïðîçîðåöà äî ïúëíèòå ìó ðàçìåðè" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Ïðåõâúðëè íà ñëåäâàùèÿ äîêóìåíò" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Ïðåõâúðëè íà ïðåäèøíèÿ äîêóìåíò" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Çàòâàðÿ ïðîçîðåöà è ïèòà äàëè äà çàïèøå äîêóìåíòèòå" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Íîðìàëíàòà ãîëåìèíà íà ïðîçîðåöà" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3030,7 +3037,7 @@ msgstr "" "Çàòâîðè ðåæèìà íà ïðåãëåä\n" "Îòìåíè ïðåãëåäà" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3049,23 +3056,23 @@ msgstr "" "WinMerge.Document\n" "WinMerge Äîêóìåíò" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Çàïàçè îðèãèíàëíèÿ ñèìâîë EOL" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Íàòèñíè êëàâèø" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Íàòèñíè äåñåí áóòîí çà êîïèðàíå íà ïúòÿ" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3074,152 +3081,152 @@ msgstr "" "Ðàçðàáîò÷èöè:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "WinMerge èäâà áåç ÍÈÊÀÊÂÀ ÃÀÐÀÍÖÈß. Òîâà å ñâîáîäåí ñîôòóåð è Âèå ìîæåòå äà ãî ðàçïðîñòðàíÿâàòå ïðè íÿêîè îáñòîÿòåëñòâà; çà äåòàéëè âèæòå GNU Public License â ïîìîùíîòî ìåíþ." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&ÎÊ" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Ïðåêúñíè" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Îïèòàé ïàê" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Èãíîðèðàé" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Èãíîðèðàé &âñè÷êî" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Äà" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Äà çà &âñè÷êè" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Íå" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Íå çà Â&ñè÷êè" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Ïðîäúëæè" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Ïðåñêî÷è" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Ïðåñêî÷è &âñè÷êè" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Íå ïîêàçâàé òîâà ñúîáùåíèå îòíîâî." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Íå ïèòàé ïàê òîçè âúïðîñ." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Öâåòîâå íà ñèíòàêñèñà" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Öâåòîâå íà òåêñòà" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Êîíòðîë íà âåðñèÿòà" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Âåðñèÿ %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "Óíèêîä" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Íàñòðîéêè (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Âñè÷êè ñúîáùåíèÿ ñå ïîêàçâàò îòíîâî." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Ïðîìåíèòå ñå ïðàâÿò íà ôàéëîâåòå îò òåêóùèàòà ñåñèÿ íà ñðàâíåíèå. Íÿêîè ïðîìåíè ùå ñòàíàò äîêàòî ñå ðåñòàðòèðà òåêóùàòà ñåñèÿ." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Èçáðàíèÿ øðèôò íÿìà äà îêàçâà âëèÿíèå íà íèêîè îò òåêóùèòå ïðîçîðöè." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3230,7 +3237,7 @@ msgstr "" "\n" "Ìîëÿ, èçïîëçâàéòå ñòîéíîñò îò 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3238,107 +3245,107 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Îòâîðè" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàìè|*.exe;*.bat;*.cmd|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ôàéëîâå ñ ïðîåêòè (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ôàéëîâå çà íàñòðîéêà (*.ini)|*.ini|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ôàéëîâå (*.htm,*.html)|*.htm;*.html|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ôàéëîâå (*.xml)|*.xml|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Öÿëîòî ñúäúðæàíèå" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Áúðç äîñòúï" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Ïðîìåíåíà äàòà" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Ïðîìåíåíè äàòà è ðàçìåð" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Ðàçìåð" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Èìå" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Ìÿñòî" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Ôèëòðè" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Îïèñàíèå" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Èçáåðåòå èìå çà íîâèÿ ôèëòúð" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ôàéëîâè Ôèëòðè (*.flt)|*.flt|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3347,7 +3354,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3360,7 +3367,7 @@ msgstr "" "\n" "Ìîëÿ, óâåðåòå ñå ÷å ïàïêàòà ñúùåñòâóâà è ìîæå äà ñå çàïèñâà â íåÿ." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3371,7 +3378,7 @@ msgstr "" "\n" "Ìîëÿ, èçáåðåòå ïàïêà çà ôèëòðè â Íàñòðîéêè/Ñèñòåìíè." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3384,12 +3391,12 @@ msgstr "" "\n" "Ìîæå áè ôàéëúò å ñàìî çà ÷åòåíå?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Çàäàéòå ôèëòúðåí ôàéë çà èíñòàëèðàíå" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3400,208 +3407,208 @@ msgstr "" "\n" "Íå ìîæå äà ñå êîïèðà íîâèÿò ôàéë â ïàïêàòà ñ ôèëòðè." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôèëòúðíèÿò ôàéë âå÷å ñúùåñòâóâà. Äà ñå ïðåçàïèøå ëè ñúùåñòâóâàùèÿò ôèëòúð?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Ïúò äî cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Ïúò äî SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Ðåçóëòàòè îò ñðàâíÿâàíå íà äèðåêòîðèèòå" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Ñðàâíÿâàíå íà ôàéëîâå" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Áåç çàãëàâèå ëÿâ" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Áåç çàãëàâèå äåñåí" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Ñêàíèðàíå íà ôàéëîâåòå..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Îòâàðÿ èçáðàíîòî" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Êîïèðà îò ëÿâî íà äÿñíî" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Êîïèðà îò äÿñíî íà ëÿâî" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Êîïèðà âñè÷êî â ëÿâî" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Êîïèðà âñè÷êî â äÿñíî" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Êîïèðàíå íà ôàéëîâå..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Èçòðèâàíå íà ôàéëîâå..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Ïðåìåñòâàíå íà ôàéëîâå..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Ñúçäàâàíå íà îò÷åò..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ðåä: %s Êîë: %d/%d Ñèì: %d/%d EOL: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Ðåä: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ðåä: %s Êîë: %d/%d Ñèì: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Ñëèâàíå" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Ðàçëèêè %1 îò %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 Íàìåðåíè ðàçëèêè" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 Íàìåðåíà ðàçëèêà" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Åëåìåíò %1 îò %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Îáùî: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Èçáåðåòå äâå ÑÚÙÅÑÒÂÓÂÀÙÈ äèðåêòîðèè èëè ôàéëîâå çà ñðàâíåíèå" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Èçáîð íà äèðåêòîðèÿ" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Èçáåðåòå äâå ïàïêè èëè äâà ôàéëà çà ñðàâíåíèå." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Íåâàëèäåí ëÿâ ïúò!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Íåâàëèäåí äåñåí ïúò!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Äâàòà ïúòÿ ñà íåâàëèäíè!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Èçáåðåòå äâà ôàéëà çà àêòèâèðàíå íà èçáîðà çà ðàçàðõèâèðàíå." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Íå ìîæå äà ñå ñðàâíè ôàéë ñ äèðåêòîðèÿ!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Íå å íàìåðåí ôàéëà: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Íå å ðàçàðõèâèðàí ôàéëà: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3614,7 +3621,7 @@ msgstr "" "\n" "ñà èäåíòè÷íè äâîè÷íè ôàéëîâå." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3627,7 +3634,7 @@ msgstr "" "\n" "ñà ðàçëè÷íè äâîè÷íè ôàéëîâå." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3638,7 +3645,7 @@ msgstr "" "\n" "å äâîè÷åí ôàéë. Íå ìîæå äà ñå ñðàâíÿâà äâîè÷åí ñ òåêñòîâ ôàéë." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3651,37 +3658,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Çàïèøè êàòî" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Çàïèøè ïðîìåíèòå íà %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Ãðåøêà ïðè ïðîâåðêàòà çà çàïèñ" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ðåçåðâíî êîïèå" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3694,7 +3701,7 @@ msgstr "" "\n" "Äà ïðîäúëæà ëè?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3711,7 +3718,7 @@ msgstr "" "\t-èçïîëçâàòå ðàçëè÷íî èìå (íàòèñíåòå Ok)\n" "\t-îòìåíèòå òåêóùàòà îïåðàöèÿ (íàòèñíåòå Îòìåíè)?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3726,7 +3733,7 @@ msgstr "" "\n" "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3741,7 +3748,7 @@ msgstr "" "\n" "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3756,7 +3763,7 @@ msgstr "" "\n" "Äà çàìåíÿ ëè ïðîìåíåíèÿ ôàéë?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3765,7 +3772,7 @@ msgstr "" "%1\n" "å ìàðêèðàí ñàìî ç ÷åòåíå. Èñêàòå ëè äà çàìåíèòå åëåìåíòà ñàìî çà ÷åòåíå?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3780,17 +3787,17 @@ msgstr "" "\n" "Àêî èñêàòå äà îáíîâèòå ôàéëîâåòå, çàòâîðåòå òåêóùîòî ôàéëîâî ñðàâíÿâàíå è îòâîðåòå ôàéëîâåòå îòíîâî." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Çàïèøè ëåâèÿ ôàéë êàòî" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Çàïèøè äåñíèÿ ôàéë êàòî" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3801,42 +3808,42 @@ msgstr "" "\n" "Îáíîâåòå äîêóìåíòèòå ïðåäè äà ïðîäúëæèòå." -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Âèå òðÿáâà äà èçáåðåòå SourceSafe ïðîåêò çà äà ïðîäúëæèòå (ïð: $/MyProject)" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Ïðîâåðÿâàíå íà ôàéëîâå îò VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versioning System âúðíà ãðåøêà ïðè îïèòà äà ïðîâåðè ôàéëà. Íå ìîæå äà ïðîäúëæè..." -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Ãðåøêà ïðè ñòàðòèðàíå íà êîìàíäà îò versioning system." -#: Merge.rc:2107 +#: Merge.rc:2110 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ðàáîòíàòà ïàïêà è ðàçïîëîæåíèåòî íà ôàéëà íå ñúâïàäàò. Ùå ïðîäúëæèòå ëè?" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Íå å íàìåðåíà VSS áàçà äàííè!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Ãðåøêà îò VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3847,7 +3854,7 @@ msgstr "" " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä.\n" " Äà îòìåíÿ ëè ïðîâåðêàòà?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3856,179 +3863,179 @@ msgstr "" "Versioning System âúðíà ãðåøêà äîêàòî ñå îïèòâà äà îòìåíè ïðîâåðêàòà íà ôàéëà.\n" " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä." -#: Merge.rc:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Íÿìà" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ïðåäè â.5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (â.5.0 è íàãîðå)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî èëè ïóíêòóàöèÿ" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Êîïèðàé èçáðàíèòå íåùà â çàäàäåíàòà ïàïêà" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Êîïèðàé èçáðàíèòå íåùà â ïîòðåáèòåëñêà ïàïêà" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Èçòðèâàíå íà èçáðàíèÿ îáåêò îò ëÿâî" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Èçòðèâàíå íà èçáðàíèÿ îáåêò îò äÿñíî" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Èçòðèâàíå íà èçáðàíèÿ îáåêò(è) îò äâåòå ñòðàíè" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ñêðèé èçáðàíèÿ îáåêò(è) ('on the fly' ôèëòúð)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Ïðåèìåíóâàé èçáðàíèÿ åëåìåíò â äâåòå ñòðàíè" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Îò äÿñíî êúì ëÿâî (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Îò ëÿâî êúì äÿñíî (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Äåñåí êúì ëÿâ (%1 oò %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ëÿâ êúì äåñåí (%1 oò %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Ëÿâ êúì... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Äåñåí êúì... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ëÿâ êúì... (%1 oò %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Äåñåí êúì... (%1 oò %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Ëÿâî (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Äÿñíî (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Äâåòå(%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Ëÿâ (%1 îò %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Äåñåí (%1 îò %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "äâåòå (%1 îò %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Èçáîð íà äèðåêòîðèÿ" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Ëÿâà ÷àñò - èçáåðåòå ïàïêà:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Äÿñíà ÷àñò - èçáåðåòå ïàïêà:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Ôàéëà çàñåãíàòè)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 îò %2 ôàéëà çàñåãíàòè)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà ñå êîïèðàò âñè÷êè ðàçëèêè â ëåâèÿò ôàéë?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà ñå êîïèðàò âñè÷êè ðàçëèêè â äåñíèÿò ôàéë?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4043,17 +4050,17 @@ msgstr "" "â\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà ñå êîïèðà %1 êúì %2 èçáðàíèòå îáåêò(è)?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçòðèåòå %1 îò %2 èçáðàíèòå îáåêò(è)?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4064,7 +4071,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4075,17 +4082,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4097,458 +4104,458 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Îòâàðÿíå íà ëåâèÿ ôàéë" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Îòâàðÿíå íà ëåâèÿ ôàéë ñ âúíøåí ðåäàêòîð" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Îòâàðÿíå íà ëåâèÿ ôàéë ñ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Îòâàðÿíå íà äåñíèÿ ôàéë" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Îòâàðÿíå íà äåñíèÿ ôàéë ñ âúíøåí ðåäàêòîð" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Îòâàðÿíå íà äåñíèÿ ôàéë ñ..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íå ìîæå äà ñå ñòàðòèðà âúíøíèÿ ðåäàêòîð: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Íåïîçíàòî ðàçøèðåíèå çà âúíøíèÿ ðåäàêòîð: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Êîïèðàé ôàéëîâèòå èìåíà â êëèïáîðäà" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Êîïèðàé ïúòÿ äî äîêóìåíòà â ëÿâî â êëèïáîðäà" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Êîïèðàé ïúòÿ äî äîêóìåíòà â äÿñíî â êëèïáîðäà" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Êîïèðàé ïúòÿ äî äîêóìåíòà â äâåòå ñòðàíè â êëèïáîðäà" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Íåïîçíàò àðõèâåí ôîðìàò" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Äîáàâè îáåêòèòå îò ëÿâàòà ñòðàíà â àðõèâ" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Äîáàâè îáåêòèòå îò äÿñíàòà ñòðàíà â àðõèâ" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Äîáàâè îáåêòèòå îò äâåòå ñòðàíè â àðõèâ" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Äîáàâè äðóãè îáåêòè â àðõèâ (îò äâåòå ñòðàíè)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Ïðåìåñòè èçáðàíèÿ ôàéë îò ëÿâî â äàäåíà ïàïêà" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Ïðåìåñòè èçáðàíèÿ ôàéë îò äÿñíî â äàäåíà ïàïêà" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Èìå" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Äèðåêòîðèÿ" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Ðåçóëòàòè ïðè ñðàâíÿâàíå" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Ëÿâà äàòà" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Äÿñíà äàòà" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Ðàçøèðåíèå" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Ðàçìåð íà ëÿâàòà ÷àñò" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Ðàçìåð íà äÿñíàòà ÷àñò" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Ðàçìåð îò äÿñíî (Êðàòúê)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Ðàçìåð îò ëÿâî (Êðàòúê)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Âðåìå çà íàïðàâà íà ëÿâàòà ÷àñò" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Âðåìå çà íàïðàâà íà äÿñíàòà ÷àñò" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Íîâè ôàéëîâå" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Âåðñèÿ íà ëåâèÿ ôàéë" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Âåðñèÿ íà äåñíèÿ ôàéë" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Áúðçè ðåçóëòàòè" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòè îò ëÿâî" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòè îò äÿñíî" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Ëÿâ EOL" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Äåñåí EOL" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Ëÿâà êîäèðîâêà" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Äÿñíà êîäèðîâêà" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Èãíîðèðàíè ðàçëèêè" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Ðàçëèêè" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Äâîè÷åí" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Íå ìîæå äà ñå ñðàâíÿò ôàéëîâåòå" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Ïðåêúñíàò ôàéë" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Ïðîïóñíàò ôàéë" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Ïðîïóñíàòà äèðåêòîðèÿ" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíèòå ôàéëîâå ñà åäíàêâè" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Áèíàðíèòå ôàéëîâå ñà ðàçëè÷íè" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Ðàçëè÷íè ôàéëîâå" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Ñàìî ëåâèÿò" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Ñàìî äåñíèÿò" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Îñòàâàùî âðåìå: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 èçáðàí îáåêò" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 èçáðàíè îáåêòà" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Èìå íà ïàïêàòà èëè ôàéëà." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìå íà ïîäïàïêàòà, êîãàòî ñà âêëþ÷åíè ïîäïàïêèòå." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëòàò íà ñðàâíåíèåòî, äúëãà ôîðìà." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Äàòà íà ïðîìÿíà íà ëÿâàòà ñòðàíà." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Äàòà íà ïðîìÿíà íà äÿñíàòà ñòðàíà." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Ðàçøèðåíèå íà ôàéëà." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Ðàçìåð íà ëåâèÿ ôàéë â áàéòà." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Ðàçìåð íà äåñíèÿ ôàéë â áàéòà." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â ëÿâî." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â äÿñíî." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Äàòà íà ñúçäàâàíå íà ëÿâàòà ñòðàíà." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Äàòà íà ñúçäàâàíå íà äÿñíàòà ñòðàíà." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçâà êîÿ ñòðàíà èìà ïî-íîâà äàòà íà ïðîìÿíà." -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñèÿ íà ôàéëà îò ëÿâî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñèÿ íà ôàéëà îò äÿñíî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Êðàòêè ðåçóëòàòè íà ñðàâíÿâàíå." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòè íà ëÿâàòà ñòðàíà." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòè íà äÿñíàòà ñòðàíà." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "EOL òèï íà ëåâèÿ ôàéë" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "EOL òèï íà äåñíèÿ ôàéë" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Êîäèðîâêà íà ëÿâàòà ñòðàíà." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Êîäèðîâêà íà äÿñíàòà ñòðàíà." -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áðîé íà èãíîðèðàíèòå ðàçëèêè âúâ ôàéë. Òåçè ðàçëèêè ñà èãíîðèðàíè îò WinMerge è íå ìîãàò äà áúäàò ñìåñåíè." -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áðîé íà ðàçëè÷èÿòà âúâ ôàéë. Òîçè áðîé íå âêëþ÷âà èãíîðèðàíèòå ðàçëèêè." -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàæè çâåçäè÷êà (*), àêî ôàéëúò å äâîè÷åí." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Ñðàâíÿâàíå íà %1 ñ %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Ñïèñúê, ðàçäåëåí ñúñ çàïåòàÿ" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Ñïèñúê, ðàçäåëåí ñ òàáóëàöèÿ" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "×èñò HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "×èñò XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéëúò ñ îò÷åòà âå÷å ñúùåñòâóâà. Èñêàòå ëè äà çàìåíèòå ñúùåñòâóâàùèÿ ôàéë?" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4557,47 +4564,47 @@ msgstr "" "Ãðåøêà ïðè ñúçäàâàíå íà îò÷åòà:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Îò÷åòúò áåøå ñúçäàäåí óñïåøíî." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Åäíàêâè ôàéëîâå ñà îòâîðåíè â äâàòà ïàíåëà." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Èçáðàíèòå ôàéëîâå ñà åäíàêâè." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Èçáðàíàòà ïàïêà ñúùåñòâóâà ñàìî â äðóãàòà ñòðàíà è ñëåäîâàòåëíî íå ìîæå äà áúäå îòâîðåíà." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïîëó÷è ñå ãðåøêà ïðè ñðàâíÿâàíå íà ôàéëîâåòå." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Äâîè÷íèòå ôàéëîâå íå ìîãàò äà ñå ñðàâíÿâàò âèäèìî." -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Íå ìîæå äà ñå ñúçäàäàò âðåìåííè ôàéëîâå. Ïðîâåðåòå íàñòðîéêèòå çà âðåìåííè ôàéëîâå." -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Äèðåêòîðèèòå íå ìîãàò äà áúäàò ñðàâíÿâàíè âèäèìî." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4612,7 +4619,7 @@ msgstr "" "\n" "Áåëåæêà: Àêî èñêàòå äà ñ÷èòàòå âñè÷êè âúðíàòè òèïîâå êàòî åäíàêâè, çàäàéòå îïöèÿòà 'Èãíîðèðàé ðàçëè÷íèòå âúðíàòè òèïîâå..' â ðàçäåëà Ñðàâíÿâàíå îò ïðîçîðåöà ñ íàñòðîéêèòå (íàìèðà ñå îò Ðåäàêòèðàíå/Íàñòðîéêè)." -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4623,22 +4630,22 @@ msgstr "" " Ñ òåêóùèòå íàñòðîéêè òå ùå áúäàò óåäíàêâåíè êúì ñòàíäàðòíèÿ òèï.\n" " Èñêàòå ëè äà ñìåíèòå íàñòðîéêèòå è äà çàïàçèòå ðàçëè÷íèòå EOL ?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Âúçíèêíà ãðåøêà äîêàòî ñå ïðîâåðÿâàøå çà ïðåäâàðèòåëíè ãðåøêè ôàéëúò '%1' ñ äîáàâêàòà '%2'. Ïðåäâàðèòåëíîòî ïðîâåðÿâàíå çà ãðåøêè íå ñå ïðèëàãà âå÷å." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Èçáðàíàòà ïàïêà å íåâàëèäíà." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íå ìîæå äà ñå îòâîðè äâîè÷åí ôàéë ñ ðåäàêòîð." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4649,132 +4656,132 @@ msgstr "" "Ïîêàçâàíåòî íà âñåêè ôàéë ñ íåãîâàòà êîäèðîâêà ùå äàäå ïî-äîáðà âèäèìîñò, íî ñðàâíÿâàíåòî èëè êîïèðàíåòî ùå å îïàñíî.\n" "Èñêàòå ëè ôàéëîâåòå äà ñå îáðàáîòâàò, èçïîëçâàéêè çàäàäåíàòà êîäèðîâêà íà Windows (ïðåïîðú÷èòåëíî)?" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Âíèìàíèå: Ôàéëîâåòå èçïîëçâàò ðàçëè÷íà êîäèðîâêà, ëÿâ=%s è äåñåí=%s, ñðàâíåíèåòî ìîæå äà äîâåäå äî çàãóáà íà èíôîðìàöèÿ." -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Çàãóáà íà èíôîðìàöèÿ, ïîðàäè ãðåøêà â êîäèðîâêàòà íà: äâàòà ôàéëà" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Çàãóáà íà èíôîðìàöèÿ, ïîðàäè ãðåøêà â êîäèðîâêàòà íà: äåñíèÿ ôàéë" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Çàãóáà íà èíôîðìàöèÿ, ïîðàäè ãðåøêà â êîäèðîâêàòà íà: ëåâèÿ ôàéë" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Áåç ðàçëèêè" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Ðàçëèêè â ðåäîâåòå" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåíåíè %1 íèç(à)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå ìîæå äà ñå íàìåðè íèçà \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Êîïèðàé ïúëíèÿ ïúò" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Êîïèðàé èìåòî íà ôàéëà" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Ìåñòîïîëîæåíèå" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Ðàçëèêè" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Ïà÷úò å ãîòîâ." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ïà÷à âå÷å ñúùåñòâóâà. Ùå ãî ïðåçàïèøåòå ëè?" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 èçáðàíè ôàéëîâå]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Íîðìàëåí" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Óíèôèöèðàí" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Íå ìîæå äà ñå çàïèøå âúðõó %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Çàäàäåíèÿò ïúò íå å ïúëåí ïúò: %1" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Çàäàéòå èçõîäåí ôàéë" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äâîè÷íè ôàéëîâå." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äèðåêòîðèè." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4785,17 +4792,17 @@ msgstr "" "\n" "Ñúçäàâàíåòî íà ïà÷ èçèñêâà äà íÿìà íåçàïèñàíè ïðîìåíè âúâ ôàéëîâåòå." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Ïàïêàòà íå ñúùåñòâóâà." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Ðåçóëòàòèòå îò òåêóùîòî ñðàâíÿâàíå íà äèðåêòîðèèòå ùå áúäàò èç÷èñòåíè." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4806,7 +4813,7 @@ msgstr "" "Íå ñà íàìåðåíè íåîáõîäèìèòå êîìïîíåíòè (7-zip è/èëè Merge7z*.dll) çà ïîääðúæêàòà íà àðõèâè.\n" "Ïîãëåäíåòå ðúêîâîäñòâîòî çà ïîâå÷å èíôîðìàöèÿ îòíîñíî ïîääðúæêàòà íà àðõèâè è êàê äà ÿ âêëþ÷èòå." -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4815,7 +4822,7 @@ msgstr "" "\n" "Áåëåæêà: Èíòåãðèðàíåòî íà 7-Zip å çàáðàíåíî â íàñòðîéêèòå íà WinMerge." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4824,37 +4831,37 @@ msgstr "" "\n" "Áåëåæêà: Èíòåãðèðàíåòî íà 7-Zip å îãðàíè÷åíî äî ñîáñòâåíè äåéñòâèÿ â íàñòðîéêèòå íà WinMerge." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Èçáåðåòå ôàéë çà åêñïîðò" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Èçáåðåòå ôàéë çà èìïîðò" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Íàñòðîéêèòå ñà èìïîðòèðàíè îò ôàéë." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Íàñòðîéêèòå ñà åêñïîðòèðàíè âúâ ôàéë." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Íå ìîæå äà ñå èìïîðòèðàò íàñòðîéêèòå îò ôàéë." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Íå ìîæå äà ñå åêñïîðòèðàò íàñòðîéêèòå âúâ ôàéë." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4862,1098 +4869,1098 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Ðåäîâíà èçðàçíà ãðåøêà" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Íÿìà ñúâïàäåíèÿ" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Íåâàëèäåí èçðàç" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Íåâàëèäåí ñèìâîë çà ïðîâåðêà" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Íåâàëèäåí ñèìâîë â èìåòî íà êëàñà" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Ïðîñëåäÿâàíå íà îáðàòíî íàêëîíåíà ÷åðòà" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Íåñðàâíèì [ èëè [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Íåñðàâíèì ( èëè \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Íåñðàâíèì \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Íåâàëèäíî ñúäúðæàíèå íà \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Íåâàëèäåí êðàé íà äèàïàçîíà" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Íåäîñòàòú÷íà ïàìåò" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Íåñðàâíèì ) èëè \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Àôðèêàíñêè" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Àëáàíñêè" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Àðàáñêè (Saudi Arabian)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Àðàáñêè (Iraq)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Àðàáñêè (Egyptian)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Àðàáñêè (Libyan)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Àðàáñêè (Algerian)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Àðàáñêè (Moroccan)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Àðàáñêè (Tunisian)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Àðàáñêè (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Àðàáñêè (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Àðàáñêè (Syrian)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Àðàáñêè (Jordan)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Àðàáñêè (Lebanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Àðàáñêè (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Àðàáñêè (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Àðàáñêè (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Àðàáñêè (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Àðìåíñêè" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Áàñêñêè" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Áåëàðóñêè" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Áúëãàðñêè" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Êàòàëîíñêè" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Êèòàéñêè (Traditional)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Êèòàéñêè (Simplified)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Êèòàéñêè (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Êèòàéñêè (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Êèòàéñêè (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Õúðâàòñêè" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "×åøêè" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Äàòñêè" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Õîëàíäñêè" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Õîëàíäñêè (Belgium)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Àíãëèéñêè (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Àíãëèéñêè (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Àíãëèéñêè (Australian)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Àíãëèéñêè (Canadian)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Àíãëèéñêè (New Zealand)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Àíãëèéñêè (Irish)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Àíãëèéñêè (So. African)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Àíãëèéñêè (Jamaican)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Àíãëèéñêè (Caribbean)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Àíãëèéñêè (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Àíãëèéñêè (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Àíãëèéñêè (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Àíãëèéñêè (Philippines)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Åñòîíñêè" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Ôàðåîðñêè" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Ôèíëàíäñêè" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Ôðåíñêè" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Ôðåíñêè (Belgique)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Ôðåíñêè (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Ôðåíñêè (Switzerland)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Ôðåíñêè (Luxembourg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Ôðåíñêè (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Ãðóçèíñêè" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Íåìñêè (Germany)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Íåìñêè (Switzerland)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Íåìñêè (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Íåìñêè (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Íåìñêè (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Ãðúöêè" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Èâðèò" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Õèíäè" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Óíãàðñêè" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Èñëàíäñêè" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Èíäîíåçèéñêè" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Èòàëèàíñêè" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Èòàëèàíñêè (Swiss)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "ßïîíñêè" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Êîðåéñêè" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Êîðåéñêè (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Ëàòâèéñêè" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Ëèòîâñêè" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Íîðâåæêè (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Íîðâåæêè (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Ïîëñêè" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Ïîðòóãàëñêè" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Áðàçèëñêè Ïîðòóãàëñêè" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Ðóìúíñêè" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Ðóñêè" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Ñðúáñêè (Latin)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Ñðúáñêè (Cyrillic)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Ñëîâàøêè" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Ñëîâåíñêè" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Èñïàíñêè" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Èñïàíñêè (Mexican)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Èñïàíñêè (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Èñïàíñêè (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Èñïàíñêè (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Èñïàíñêè (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Èñïàíñêè (Dominican)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Âåíåöóåëñêè èñïàíñêè" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Èñïàíñêè (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Èñïàíñêè (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Èñïàíñêè (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Èñïàíñêè (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Èñïàíñêè (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Èñïàíñêè (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Èñïàíñêè (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Èñïàíñêè (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Èñïàíñêè (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Èñïàíñêè (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Èñïàíñêè (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Èñïàíñêè (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Ñóàõèëè (Kenya)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Øâåäñêè" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Øâåäñêè (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Òàéëàíäñêè" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Òóðñêè" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Óêðàèíñêè" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Âèåòíàìñêè" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Çàïàäíî Åâðîïåéñêè" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Èçòî÷íî Åâðîïåéñêè" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Èçòî÷íî Àçèàòñêè" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Àçèàòñêè" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Öåíòðàëíî Åâðîïåéñêè" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Íåïðèëîæèì" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Ñìåñåí" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " á" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " Êá" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr " Ìá" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr " Ãá" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr " Òá" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr " Ïá" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Çàïàçâàíå íà ëåâèÿ ôàéë" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Çàïàçâàíå íà äåñíèÿ ôàéë" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Çàïàçâàíå íà ëåâèÿ ôàéë êàòî..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Çàïàçâàíå íà äåñíèÿ ôàéë êàòî..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Ñìåíÿíå íà ñòàòóñà ñàìî çà ÷åòåíå íà ëåâèÿ ôàéë/äèðåêòîðèÿ" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Ñìåíÿíå íà ñòàòóñà ñàìî çà ÷åòåíå íà äåñíèÿ ôàéë/äèðåêòîðèÿ" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Êîíâåðòèðàé EOL â DOS ðåæèì" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Êîíâåðòèðàé EOL â UNIX ðåæèì" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Êîíâåðòèðàé EOL â MAC ðåæèì" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Ïðåâêëþ÷è ìåæäó ðåæèìèòå íà ðåäàêòèðàíå è ñðàâíåíèå" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5962,12 +5969,12 @@ msgstr "" "Âèæ è çàäàé íàñòðîéêèòå íà êîäèðîâêàòà íà ôàéëà\n" "Íàñòðîéêè íà êîäèðîâêàòà íà ôàéëà" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5976,7 +5983,7 @@ msgstr "" "Èçáåðåòå ðàçëè÷íèòå íåùà â òåêóùèÿ ðåä\n" "Ðàçëè÷èÿ â òåêóùèÿ ðåä" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5985,7 +5992,7 @@ msgstr "" "Îòèäè íà ðåä èëè ðàçëèêà\n" "Îòèäè íà (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5994,7 +6001,7 @@ msgstr "" "Ïðîìÿíà íà ïðîãðàìíèòå íàñòðîéêè\n" "Íàñòðîéêè" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6003,37 +6010,37 @@ msgstr "" "Îáíîâè ïîêàçàíîòî\n" "Îáíîâè (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Êîïèðàíå íà èçáðàíèòå ðåäîâå â êëèïáîðäà, äîáàâÿéêè íîìåðà íà ðåäîâåòå â íà÷àëîòî" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Îáíîâè èçáðàíèòå îáåêòè" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Ïðèêðåïè îòìåòêà" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Îòèäè íà ñëåäâàùàòà îòìåòêà" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Îòèäè íà ïðåäèøíàòà îòìåòêà" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Èç÷èñòè âñè÷êè îòìåòêè" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6042,7 +6049,7 @@ msgstr "" "Ïîêàæè åëåìåíòèòå, êîèòî ñà àáñîëþòíî åäíàêâè\n" "Ïîêàæè åäíàêâèòå îáåêòè" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6051,7 +6058,7 @@ msgstr "" "Ïîêàæè åëåìåíòèòå, êîèòî èìàò ðàçëèêè\n" "Ïîêàæè ðàçëè÷íèòå îáåêòè" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6060,7 +6067,7 @@ msgstr "" "Ïîêàæè åëåìåíòèòå, êîèòî ñúùåñòâóâàò ñàìî â ëÿâàòà ñòðàíà\n" "Ïîêàæè óíèêàëíèòå îáåêòè â ëÿâî" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6069,7 +6076,7 @@ msgstr "" "Ïîêàæè åëåìåíòèòå, êîèòî ñúùåñòâóâàò ñàìî â äÿñíàòà ñòðàíà\n" "Ïîêàæè óíèêàëíèòå îáåêòè â äÿñíî" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6078,7 +6085,7 @@ msgstr "" "Ïîêàçâà äâîè÷íè ôàéëîâå\n" "Ïîêàæè äâîè÷íè ôàéëîâå" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6087,7 +6094,7 @@ msgstr "" "Ïîêàçâà ïðåñêî÷åíèòå åëåìåíòè\n" "Ïîêàæè ïðåñêî÷åíèòå åëåìåíòè" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6096,7 +6103,7 @@ msgstr "" "Èçáèðàíå íà øðèôò çà èçãëåäà\n" "Èçáåðåòå øðèôò çà èçãëåäà" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6105,27 +6112,27 @@ msgstr "" "Çàäàâàíå çà èçïîëçâàíå íà ñèñòåìíèÿ øðèôò\n" "Ñèñòåìåí øðèôò" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Ïîêàæè ïðàçíèòå ìåñòà" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Âêëþ÷âà/Èçêëþ÷âà ñïèñúêà ñ ðàçëè÷èÿ" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Ïðîçîðåöà ñ ïîëîæåíèåòî ïîêàçâà öÿëîñòíà êàðòèíà îò ôàéëà" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Ïîêàçâà ñòàòèñòèêàòà çà ñðàâíåíèå íà ïàïêèòå" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6134,7 +6141,7 @@ msgstr "" "Èçáåðåòå åçèê çà èíòåðôåéñà íà ïðîãðàìàòà\n" "Åçèê" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6143,12 +6150,12 @@ msgstr "" "Ïîêàçâàé ðàçëèêèòå â ðåäà ñ ðàçëè÷åí öâÿò\n" "Ïîêàæè ðàçëèêèòå â ðåäà" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Ñìåíè ïîçèöèèòå íà äâàòà ïàíåëà" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6157,7 +6164,7 @@ msgstr "" "Ïîêàæè íîìåðà íà ðåäîâåòå\n" "Ïîêàæè íîìåðà íà ðåäîâåòå" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6166,24 +6173,24 @@ msgstr "" "Ïîçâîëè ïðåíàñÿíå íà äóìè\n" "Ïðåíàñÿé ðåäîâåòå" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6192,7 +6199,7 @@ msgstr "" "Ïðèäâèæè ñå íà ïðåäèøíàòà ðàçëèêà\n" "Ïðåäèøíà ðàçëèêà (Alt+Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6201,7 +6208,7 @@ msgstr "" "Ïðèäâèæè ñå íà ñëåäâàùàòà ðàçëèêà\n" "Ñëåäâàùà ðàçëèêà (Alt+Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6210,7 +6217,7 @@ msgstr "" "Ïðèäâèæâàíå íà ïúðâàòà ðàçëèêà\n" "Ïúðâà ðàçëèêà (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6219,7 +6226,7 @@ msgstr "" "Ïðèäâèæâàíå íà òåêóùàòà ðàçëèêà\n" "Òåêóùà ðàçëèêà (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6228,7 +6235,7 @@ msgstr "" "Ïðèäâèæâàíå íà ïîñëåäíàòà ðàçëèêà\n" "Ïîñëåäíà ðàçëèêà (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6237,7 +6244,7 @@ msgstr "" "Êîïèðàíå íà èçáðàíèÿ òåêñò â äåñíèÿ ôàéë\n" "Êîïèðàíå â äÿñíî (Alt+Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6246,7 +6253,7 @@ msgstr "" "Êîïèðàíå íà èçáðàíèÿ òåêñò â ëåâèÿ ôàéë\n" "Êîïèðàíå â ëÿâî (Alt+Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6255,7 +6262,7 @@ msgstr "" "Êîïèðàíå íà ðàçëèêàòà â äåñíèÿ ôàéë è ïðèäâèæâàíå êúì ñëåäâàùàòà\n" "Êîïèðàíå â äÿñíî è ïðèäâèæâàíå (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6264,7 +6271,7 @@ msgstr "" "Êîïèðàíå íà ðàçëèêàòà â ëåâèÿ ôàéë è ïðèäâèæâàíå êúì ñëåäâàùàòà\n" "Êîïèðàíå â ëÿâî è ïðèäâèæâàíå (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6273,7 +6280,7 @@ msgstr "" "Êîïèðàíå íà âñè÷êè ðàçëèêè â äåñíèÿ ôàéë\n" "Âñè÷êî â äÿñíî" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6282,72 +6289,72 @@ msgstr "" "Êîïèðàíå íà âñè÷êè ðàçëèêè â ëåâèÿ ôàéë\n" "Âñè÷êî â ëÿâî" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Èçòðèé èçáðàíèòå îáåêòè îò äâåòå ïàïêè" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Ñðàâíè èçáðàíèòå îáåêòè (ñðàâíè ïúðâèÿ åëåìåíò îò íÿêîëêî èçáðàíè òàêèâà)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Èçáåðè è ïîäðåäè êîëîíèòå çà ñðàâíÿâàíå íà äèðåêòîðèè" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Ñúçäàé ïà÷-ôàéë" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Èçáåðè è ïðîìåíè ôèëòðè" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Ãåíåðèðàíå íà îò÷åò îò ðåçóëòàòèòå çà ñðàâíåíèå" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Ïîòðåáèòåëÿ èçáèðà ðàçàðõèâàòîð (íÿìà ðàçàðõèâèðàíå ïðè ñðàâíÿâàíå íà ïàïêè)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Çàäàäåíèÿ ðàçàðõèâàòîð ùå ñå ïðèëîæè è çà äâàòà ôàéëà (íåîáõîäèìî å ðàçøèðåíèå ñàìî íà åäèíèÿ ôàéë)" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Èçáèðàíå íà ðàçàðõèâàòîð çà ðåäàêòèðàíå íà òîçè ôàéë" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Íÿìà ïðåäâàðèòåëíè ðàçëè÷èÿ (íîðìàëåí)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Ïðåäëîæåíà äîáàâêà" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Äðóãè äîáàâêè" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Çàòâàðÿ âñè÷êè äîáàâêè è ãè çàðåæäà îòíîâî (çà ðàçðàáîò÷èöè)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6356,12 +6363,12 @@ msgstr "" "Äà ñå âèæäà ñëåäâàùèÿ ôàéë\n" "Àêòèâèðàíå íà ñëåäâàùèÿ ôàéë" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Çàòâàðÿ âñè÷êè îòâîðåíè ïðîçîðöè" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6370,22 +6377,22 @@ msgstr "" "Ïîêàçâàíå íà ïîìîùíèÿ ôàéë íà WinMerge\n" "Ïîìîù" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Ïîêàçâàíå íà òåêóùèòå íàñòðîéêè íà WinMerge è èíôîðìàöèÿ çà âåðñèÿòà â òåêñòîâ ôàéë" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Ïîêàçâàíå íà GNU ëèöåíçà" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Âúòðåøåí áèëä: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6394,7 +6401,7 @@ msgstr "" "Îòâàðÿ ïîìîùíèÿ ôàéë íà WinMerge â ðàçäåë Èíäåêñ\n" "Èíäåêñ" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6403,267 +6410,272 @@ msgstr "" "Îòâàðÿ ïîìîùíèÿ ôàéë íà WinMerge â ðàçäåë Òúðñåíå\n" "Òúðñåíå" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Íàñòðîéêè íà äîáàâêèòå" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Íÿìà ïðåäâàðèòåëíè ðàçëè÷èÿ" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Ïðåäâàðèòåëíè ðàçëèêè, àêî å âúçìîæíî" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå å íàìåðåí - .sct ñêðèïòîâåòå ñà çàáðàíåíè" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "<Íÿìà>" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "<Àâòîìàòè÷íî>" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Îòâîðè ôàéëúò ñ ðåãèñòðèðàíîòî ïðèëîæåíèå" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Îòâîðè ôàéëúò ñ âúíøåí ðåäàêòîð" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Îòâîðè ôàéëúò ñ ëè÷íà ïðîãðàìà" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Íå ïîêàçâàé ïðåìåñòåíèòå áëîêîâå" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Ïîêàçâàé âñè÷êè ïðåìåñòåíè áëîêîâå" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Ïîêàæè ïðåìåñòåíèòå áëîêîâå ñàìî îò òåêóùàòà ðàçëèêà" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Îòèäè íà ðàçëèêàòà ïîä êóðñîðà" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Îòèäè íà ðàçëèêà %1 îò %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "Îòèäè íà ðåä %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Çàáðàíåí" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Îò ôàéëîâàòà ñèñòåìà" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Îò MRU ñïèñúê" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Catalan.po b/Src/Languages/Catalan.po index 49d4880ac..925a47353 100644 --- a/Src/Languages/Catalan.po +++ b/Src/Languages/Catalan.po @@ -71,7 +71,7 @@ msgstr "&Retalla" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "C&opia" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "Engan&xa" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&Vés a..." @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "O&bre" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "amb l'&aplicació registrada" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "amb l'&editor extern" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "a&mb..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Fitxer" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Nou\tControl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Obre...\tControl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Obre un &projecte...\tControl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Desa el P&rojecte..." @@ -158,1845 +158,1852 @@ msgid "Recent Projects" msgstr "Projectes re¢s" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Surt" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "E&dita" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "O&pcions..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Visualització" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "&Tipus de lletra..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Empra el tipus de lletra del &sistema" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "Barra d'ei&nes" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "&Cap" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "&Petita" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Gran" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "Barra d'est&at" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "Barra de ta&bulacions" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "Idio&ma..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Eines" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtres..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Genera un pedaç..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Connectors" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "Desempaquetament &manual" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "Desempaquetament &automàtic" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Edita amb el desempaquetador" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Recarrega els connectors" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "&Depuració" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "&Carrega la configuració..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "&Reinicialitza les opcions" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "Fi&nestra" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Tanca" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "T&anca-ho tot" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Canvia de &subfinestra\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Finestres en mosaic &horitzontal" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Finestres en mosaic &vertical" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "Finestres en &cascada" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Ajuda" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Temes de l'ajuda...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Índex..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Cerca..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "C&onfiguració..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Suport d'&arxivament inhabilitat..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "Llicència Pública de &GNU..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&Quant al WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Obre un &projecte...\tControl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Fes l'es&querra només de lectura" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Fes la dre&ta només de lectura" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "&Codificació del fitxer" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Selecciona-ho &tot\tControl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Mostra els elements &idèntics" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Mostra els elements di&ferents" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostra els elements únics de l'&esquerra" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostra els elements únics de la &dreta" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Mostra els elements &omesos" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Mostra els fitxers &binaris" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Mostra els elements ama&gats" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Estadístiques de &comparació" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "Actualit&za\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualitza &seleccionats\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "Co&mbinació" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "&Compara\tRetorn" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Propera diferència\tAlt+Avall" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferència a&nterior\tAlt+Amunt" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Pri&mera diferència\tAlt+Inici" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferència &actual\tAlt+Retorn" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Da&rrera diferència\tAlt+Fi" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copia a la &dreta\tAlt+Dreta" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copia a l'&esquerra\tAlt+Esquerra" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "S&uprimeix\tSupr" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Personalitza les columnes..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Gene&ra un informe..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Desa\tControl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Desa l'&Esquerra" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Desa" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "&Anomena i desa..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Desa la D&reta" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Imprimeix..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "Configuració de la pàgina" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "&Visualització prèvia de la impressió" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Converteix retorns de línia a" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "&Mode de combinació\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfés\tControl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Re&fés\tControl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Retalla\tControl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "C&opia\tControl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "Engan&xa\tControl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecciona &la diferència a la línia\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Cerca...\tControl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Subst&itueix...\tControl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Seqüències d'ordres" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Buit >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "&Avançat" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copia amb els números de línia\tControl+Maj+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Punts d'interès" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Activa/desactiva el punt d'interès\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Següent punt d'interès\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Punt d'interès previ\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Esborra tots els punts d'interès" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Vés a...\tControl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Ressaltat de sintaxi" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Mostra els es&pais" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Mostra les &diferències de la línia" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Mostra els &números de línia" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Mostra els &marges" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "A&justa les línies" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "&Intercanvia les subfinestres" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Subfinest&ra de diferències" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Subfinestra d'&ubicació" -#: Merge.rc:428 +#: Merge.rc:430 #, 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:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copia a l'esquerra i avan&ça\tAlt+Control+Esquerra" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Copia-ho &tot a la dreta" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Copia-ho t&ot a l'esquerra" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Prediferenciació" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "Compa&ra" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "D'&esquerra a dreta" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "D'e&squerra a..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "De &dreta a esquerra" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "De d&reta a..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Mou" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "D'&esquerra a..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "De &dreta a..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Suprimeix" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "De l'&esquerra" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "De la &dreta" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "D'&ambdós costats" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "Canvia el &nom" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "&Amaga els elements" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "Obre l'&esquerra" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Obre la &dreta" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "C&opia els camins" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "L'&esquerra (%1 de %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "La &dreta (%1 de %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Ambdós costats (%1 de %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Co&pia els noms" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "Co&mprimeix" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "L'&esquerra... (%1 de %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "La &dreta... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Ambdós costats... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Di&ferències... (%1 de %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "Actualit&za" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "&Copia el camí sencer al fitxer" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Copia el nom del &fitxer" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Ajustos de prediferenciació" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Sense prediferenciació" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Prediferenciació &automàtica" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Vé&s a la diferència" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "Blocs &no moguts" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Tots el blocs moguts" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Blocs moguts per a la &diferència actual" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Quant al WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(Muntatge privat)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Tots els drets reservats." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visiteu la plana web del WinMerge!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "D'acord" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Col·laboradors" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Tria de fitxers o directoris..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Esquerra:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Navega..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Dreta:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "N&avega..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Filtre:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "&Tria..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "Desem&paquetador:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "T&ria..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Inclou-hi les subcarpetes" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Estat:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Cancel·la" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Fitxers o directoris a comparar" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "&Base de dades:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "&Projecte:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "&Usuari:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "&Contrasenya:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "En&llaça amb el projecte de destinació del VSS" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Aplica a &tots els elements" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "&Extreu (check-out)" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "&Anomena i desa..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Sistema de control de versions" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "Sistema de control de &versions" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Camí al cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Desplaça automàticament fins a la primera diferència" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "Inhabilita la pantalla de &benvinguda" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "T&anca les finestres amb ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verifica els camí automàticament al diàleg d'Obrir" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "&Permet d'executar només una instància" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Autocompletar al diàleg d'obrir:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Permet múltiples finestres de comparació per" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Comparació de &carpetes" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Comparació de &fitxers" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Reinicialitza" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Idioma" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Idiomes disponibles:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Cerca" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Cerca:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "N&omés paraules senceres" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "&Distingeix entre majúscules i minúscules" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "&Expressió regular" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "No facis la &volta al final del fitxer" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Direcció" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "A&munt" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "A&vall" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Següent" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Substitueix" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Substitueix-ho p&er:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "No facis la &volta al final del fitxer" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Substitueix a" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Selecció" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "&Fitxer sencer" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "S&ubstitueix-ho" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Su&bstitueix-ho tot" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "&Extreu (check-out)" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Comentaris" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "Reintegra (check-in) després d'extreure (check-out)" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Filtres de línia" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Habilita els filtres de línia" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expressions ®ulars (una per línia):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Desa" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "Nova" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Edita" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "Suprimeix" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Diferència:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Diferència seleccionada:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Fons" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Línia absent" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Diferència ignorada:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Text mogut:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Text mogut seleccionat:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Paraula diferent:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Paraula diferent seleccionada:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Predeterminats" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Diàleg" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Desa els fitxers suprimits a la Paperera de reciclatge" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignora diferències en l'&hora inferiors a 3 segons" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integració" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Afegeix un menú contextual a l'explorador del Windows" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Habilita el &menú avançat" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "In&clou subcarpetes de forma predeterminada" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Editor extern:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "&Filtre de carpeta:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "N&avega..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Generador de pedaços" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Fitxer &1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Fitxer &2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "N&avega..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "Inter&canvia" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "A&fegeix al final del fitxer existent" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "Format" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "E&stil:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Espais" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "Co&mpara'ls" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "&Ignora'n els canvis" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "I&gnora'ls tots" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ign&ora les línies en blanc" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "&Distingeix entre majúscules i minúscules" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Inc&lou-hi la línia de comandes" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Obre-ho en un &editor extern" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Visualització de columnes" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Tria el desempaquetador" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "&Desempaquetador de fitxer:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "&Visualitza tots els desempaquetadors sense verificar l'extensió" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "&Llistat d'extensions:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "&Descripció:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "Progrés de la comparació de carpeta" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "&Atura" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Comparant elements..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Elements comparats:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Elements totals:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Anar" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "&Anar a:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Fitxer" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Anar a on" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "&Línia" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Diferència" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Vés-hi" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Comparació" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Espais en blanc" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "Compara els &espais" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "Ignora els &canvis en els espais" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Ignora t&ots els espais" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "&Ignora les línies en blanc" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignora &majúscules/minúscules" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Igno&ra diferències de salt de línia (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "&Habilita detecció de blocs desplaçats" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "Em&parella les línies similars" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Mètode de comparació de &fitxers:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "&Atura després de la primera diferència" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "&Filtra els comentaris" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "&Ressalta la sintaxi" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Re-explora &automàticament" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preserva els caracters de salt de línia originals" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulacions" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Mida de les tabulacions:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "&Insereix tabulacions" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "In&sereix espais" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Acoloriment de diferència de línia" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "&Veure les diferències de la línia" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "Nivell de &caràcter" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "Nivell de ¶ula:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filtres de fitxer" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "&Prova" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "&Instal·la..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "&Nou..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "&Edita..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "&Suprimeix..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Voleu desar els fitxers modificats?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Fitxer del costat esquerre" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Desa-hi els canvis" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "D&escarta'n els canvis" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Fitxer del costat dret" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "De&sa-hi els canvis" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Des&carta'n els canvis" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Descarta-ho tot" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Pàgina de codis" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Pàgina de codis predeterminada" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2005,32 +2012,32 @@ msgstr "" "Detecta la informació de pàgina de codis per a fitxers : .html, .rc, .xml\n" "Cal reiniciar la sessió" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Pàgina de codis del sistema" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "En funció de l'idioma de l'interfície d'usuari del WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Pàgina de codis personalitzada:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suport d'arxivament inhabilitat" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "No es pot detectat la versió del 7-Zip (potser no està instal·lat?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2040,12 +2047,12 @@ msgstr "" "ordinador, o els seus components essencials estiguin copiats al directori del programa per a\n" "un funcionament independent." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "També cal un connector d'enllaç adient (Merge7z*.dll) al camí." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2054,12 +2061,12 @@ msgstr "" "Useu la versió del 7-Zip recomanada a continuació fins que hi hagi connectors d'enllaç\n" "disponibles per a versions posteriors." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Versió" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2068,54 +2075,54 @@ msgstr "" "Connector requerit\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Versió recomanada del 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Programari del 7-Zip instal·lat:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "cap" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "absent" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Components del 7-Zip (funcionament indep.):" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "antiquat" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Camí als connectors:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2124,486 +2131,486 @@ msgstr "" "&No tornis a mostrar aquest missatge.\n" "(Sempre podeu recuperar aquest missatge des del menú d'ajuda)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Baixada del connector" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Opcions" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Importa..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Exporta..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Paraules clau:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Noms de funció:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Comentaris:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Nombres:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operadors:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Cadenes:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Preprocessador:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Usuari 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Usuari 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Negreta" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Informe de comparació de directoris" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "&Fitxer d'informe:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Estil:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Copia al Porta-retalls" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Filtre compartit o privat" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Quina mena de filtre voleu crear?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, 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:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtre privat (només per a l'usuari actual)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Suport d'arxivament" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Per al suport d'arxivament cal tenir instal·lat el connector del 7-Zip:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar el connector del 7-Zip" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Habilita el suport de fitxers d'arxivament" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usa el 7-Zip independent si està disponible" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sa el 7-Zip local de la carpeta del WinMerge" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detecta el tipus d'arxiu a partir de la signatura del fitxer" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Estadístiques de comparació" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Carpetes:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Fitxers:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Diferents" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binaris:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Únics" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Esquerra:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Dreta:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Idèntics" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Tanca" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Afectament" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Selecciona pàgina de codis per a" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&Càrrega de fitxers:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "&Desament de fitxers:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&Empra la mateixa pàgina de codis a ambdós" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "&Aplica" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Cancel·la" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Prova de filtre" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Provant el filtre ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Entreu el text a provar:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Nom de la carpeta" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "&Prova" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Tanca" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&Usa colors de text personalitzats" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Color de text personalitzat" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Espais:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Text regular:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Selecció:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Camins" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Només de &lectura" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Només de l&ectura" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "&Obre..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "De&sa..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Fitxers de còpia de seguretat" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Crea els fitxers de còpia de seguretat en:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Crea els fitxers de còpia de seguretat a:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "Carpeta del fitxer &original" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "Carpeta de còpia de seguretat &global:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Nom de fitxer de còpia de seguretat:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "&Afegeix l'extensió .bak" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "A&fegeix una marca horària" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "Confirmació de còpia" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Esteu segur que voleu copiar XXX elements?" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "D'esquerra" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "A dreta" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Sí" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "040304e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Traducció al català per en Jordi Vilar" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x403, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Preparat" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2612,7 +2619,7 @@ msgstr "" "Crea un document nou\n" "Nou (Control-N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2621,7 +2628,7 @@ msgstr "" "Obre un document existent\n" "Obrir (Control+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2630,7 +2637,7 @@ msgstr "" "Tanca el document actiu\n" "Tanca" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2639,7 +2646,7 @@ msgstr "" "Desa el document actiu\n" "Desa (Control+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2648,7 +2655,7 @@ msgstr "" "Desa el document actiu amb un nom nou\n" "Anomena i desa" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2657,7 +2664,7 @@ msgstr "" "Canvia les opcions d'impressió\n" "Format de pàgina" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2666,7 +2673,7 @@ msgstr "" "Canvia la impressora i les opcions d'impressió\n" "Configuració d'impressió" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2675,7 +2682,7 @@ msgstr "" "Imprimeix el document actiu\n" "Imprimeix" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2684,12 +2691,12 @@ msgstr "" "Visualitza pàgines senceres\n" "Visualització prèvia de la impressió" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Torna a fer visibles tots els elements amagats" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2698,32 +2705,32 @@ msgstr "" "Obre un fitxer de projecte\n" "Fitxer de projecte (Control+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, 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:1727 +#: Merge.rc:1730 #, 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:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Fitxer de projecte" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "El fitxer de projecte s'ha carregat amb èxit." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "El fitxer de projecte s'ha desat amb èxit." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2732,7 +2739,7 @@ msgstr "" "Desa els camins i les opcions actuals a un fitxer de projecte\n" "Desa fitxer de projecte" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2741,7 +2748,7 @@ msgstr "" "Visualitza informació del programa, número de versió i copyright\n" "Quant a" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2750,9 +2757,6 @@ msgstr "" "Surt de l'aplicació i us demana que deseu els documents\n" "Surt" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2766,11 +2770,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Obre aquest document" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2779,7 +2786,7 @@ msgstr "" "Canvia a la següent subfinestra\n" "Subfinestra següent" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2788,7 +2795,7 @@ msgstr "" "Canvia de nou a la subfinestra anterior\n" "Subfinestra prèvia" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2797,7 +2804,7 @@ msgstr "" "Obre una altra finestra per al document actiu\n" "Finestra nova" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2806,7 +2813,7 @@ msgstr "" "Organitza les icones a la part inferior de la finestra\n" "Organitza les icones" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2815,7 +2822,7 @@ msgstr "" "Organitza les finestres perquè se sobreposin\n" "Finestres en cascada" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2824,7 +2831,7 @@ msgstr "" "Organitza les finestres en mosaic\n" "Finestres en mosaic" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2833,7 +2840,7 @@ msgstr "" "Organitza les finestres en mosaic\n" "Finestres en mosaic" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2842,7 +2849,7 @@ msgstr "" "Divideix la finestra activa en subfinestres\n" "Divideix" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2851,7 +2858,7 @@ msgstr "" "Suprimeix la selecció\n" "Suprimeix" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2860,7 +2867,7 @@ msgstr "" "Suprimeix-ho tot\n" "Suprimeix-ho tot" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2869,7 +2876,7 @@ msgstr "" "Copia els elements seleccionats al Porta-retalls\n" "Copia" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2878,7 +2885,7 @@ msgstr "" "Elimina els elements seleccionats i els copia al Porta-retalls\n" "Retalla" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2887,7 +2894,7 @@ msgstr "" "Cerca el text especificat\n" "Cerca" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2896,7 +2903,7 @@ msgstr "" "Insereix el contingut del Porta-retalls\n" "Enganxa" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2905,7 +2912,7 @@ msgstr "" "Repeteix la darrera acció\n" "Repeteix" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2914,7 +2921,7 @@ msgstr "" "Substitueix un text específic per un altre de diferent\n" "Substitueix" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2923,7 +2930,7 @@ msgstr "" "Selecciona el document sencer\n" "Selecciona-ho tot" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2932,7 +2939,7 @@ msgstr "" "Desfà la darrera acció\n" "Desfés (Control+Z)" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2941,7 +2948,7 @@ msgstr "" "Refà la darrera acció desfeta\n" "Refés (Control+Y)" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2950,7 +2957,7 @@ msgstr "" "Mostra o amaga la barra d'eines\n" "Barra d'eines" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2959,7 +2966,7 @@ msgstr "" "Mostra o amaga la barra d'estat\n" "Barra d'estat" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2968,62 +2975,62 @@ msgstr "" "Mostra o amaga la barra de tabulacions\n" "Barra de tabulacions" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Canvia la mida de la finestra" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Canvia la posició de la finestra" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Redueix la finestra a una icona" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Engrandeix la finestra a la mida màxima" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Canvia a la següent finestra de document" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Canvia a la finestra de document prèvia" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Tanca la finestra activa i demana per a desar el document" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Restaura la finestra a la mida normal" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Activa la llista de tasques" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Activa aquesta finestra" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3032,7 +3039,7 @@ msgstr "" "Tanca el mode de visualització prèvia\n" "Tanca" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3051,23 +3058,23 @@ msgstr "" "WinMerge.Document\n" "Document WinMerge" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Preserva els caracters de salt de línia originals" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Premeu qualsevol tecla" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Clica amb el botó dret al camí a copiar" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3076,152 +3083,152 @@ msgstr "" "Desenvolupadors:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "El WinMerge s’entrega sense CAP MENA DE GARANTIA. Això és programari lliure i el podeu redistribuir sota certes condicions. Veieu la Llicència Pública de GNU al menú d’ajuda per a més detalls." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&D'acord" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Avorta" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Reintenta" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignora" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Ignora-ho &tot" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Sí" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Sí a &tot" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "No a t&ot" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Continua" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Omet" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Omet-ho &tot" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "No tornis amostrar aquest missatge." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "No tornis a preguntar-ho." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Colors de sintaxi" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Colors de text" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Control de versions" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "D'esquerra:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "A esquerra:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "De dreta:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "A dreta:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Versió %1 - Català" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Opcions (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Tots el quadres de missatges es mostraran altre cop." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "S'han fet modificacions a la sessió de comparació actual i alguns canvis poden no ser efectius fins que no reinicieu la comparacio." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "El canvi triat de tipus de lletra no serà aplicat a totes les finestres de diferències visibles actualment." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3232,7 +3239,7 @@ msgstr "" "\n" "Useu valors entre 1 i %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3243,107 +3250,107 @@ msgstr "" "\n" "Reinicieu el WinMerge després de la reinicialització." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Obre" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programes|*.exe;*.bat;*.cmd|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tots els fitxers (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fitxers de projecte del WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fitxers d'options de configuració (*.ini)|*.ini|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fitxers HTML (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fitxers XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Tot el contingut" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Contingut en un cop d'ull" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Data de modificació" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Data de modificació i mida" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Mida" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Nom" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Ubicació" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtres" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Descripció" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Selecciona un nom de fitxer per al nou filtre" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtres de fitxer (*.flt)|*.flt|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3356,7 +3363,7 @@ msgstr "" "Copieu el fitxer %1 a la carpeta WinMerge/Filters:\n" "%2." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3369,7 +3376,7 @@ msgstr "" "\n" "Verifiqueu que la carpeta existeix i s'hi pot escriure." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3380,7 +3387,7 @@ msgstr "" "\n" "Seleccioneu la carpeta de filtres a opcions/sistema." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3393,12 +3400,12 @@ msgstr "" "\n" "Potser el fitxer és només de lectura?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Localitza el fitxer de filtre a instal·lar" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3409,208 +3416,208 @@ msgstr "" "\n" "No s'ha pogut copiar el nou fitxer de filtre a la carpeta de filtres." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Expressió regular" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Camí al cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Camí al SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Resultats de la comparació dels directoris" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Comparació de fitxers" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Fitxer esquerre sense títol" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Fitxer dret sense títol" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "S'estan examinant els fitxers..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "S'està obrint la selecció" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "S'està copiant de l'esquerra a la dreta" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "S'està copiant de la dreta a l'esquerra" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "S'està copiant tot a l'esquerra" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "S'està copiant tot a la dreta" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "S'estan copiant els fitxers..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "S'estan suprimint els fitxers..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "S'estan movent els fitxers..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Creant l'informe..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Lín: %s Col: %d/%d Cars: %d/%d Salt: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Línia: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Lín: %s Col: %d/%d Cars: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Combina" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Diferència %1 de %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "S'han trobat %1 diferènces" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "S'ha trobat una diferència" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Element %1 de %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Elements: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecciona dos directoris o fitxers existents per a comparar" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Selecció de directori" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecciona dos directoris o dos fitxers per a comparar." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "El camí de l'esquerra és invalid!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "El camí de la dreta és invalid!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Ambdós camins són invalids!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Tria dos fitxers per a habilitar la selecció del desempaquetador." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "No es pot comparar un fitxer i un directori!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "El fitxer no s'ha trobat: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "El fitxer no s'ha desempaquetat: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3623,7 +3630,7 @@ msgstr "" "\n" "són fitxers binaris idèntics." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3636,7 +3643,7 @@ msgstr "" "\n" "són fitxers binaris diferents." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3647,7 +3654,7 @@ msgstr "" "\n" "és un fitxer binari. No es poden comparar fitxers de text i binaris." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3660,37 +3667,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Anomena i desa" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Voleu desar els canvis a %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Hi ha hagut un error en comprovar si la destinació era modificable" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Hi ha hagut un error en crear una còpia de seguretat del fitxer" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3703,7 +3710,7 @@ msgstr "" "\n" "Voleu continuar tot i així?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3720,7 +3727,7 @@ msgstr "" "\t-desar-lo amb un nom diferent (premeu D'acord)\n" "\t-avortar l'operació actual (Premeu Cancel·lar)?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3735,7 +3742,7 @@ msgstr "" "\n" "Voleu desar la versió desempaquetada en un altre fitxer?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3750,7 +3757,7 @@ msgstr "" "\n" "Voleu desar la versió desempaquetada en un altre fitxer?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3765,7 +3772,7 @@ msgstr "" "\n" "Voleu sobreescriure el fitxer?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3774,7 +3781,7 @@ msgstr "" "%1\n" "està marcat com a només de lectura. Voleu substituir l'element només de lectura?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3789,17 +3796,17 @@ msgstr "" "\n" "Si voleu refrescar els fitxers, tanqueu la comparació de fitxers actual i carregueu-los de bell nou." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Anomena i desa el fitxer de l'esquerra" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Anomena i desa el fitxer de la dreta" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3810,42 +3817,42 @@ msgstr "" "\n" "Cal que refresqueu els documents abans de continuar." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Extreu (check-out) fitxers del VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, 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:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "No s'han trobat cap base de dades del VSS!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Error del VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3856,7 +3863,7 @@ msgstr "" "Reviseu les especificacions de configuració de la vista emprada.\n" "Voleu desfer la operació d'extracció (check-out)?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3865,179 +3872,179 @@ 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Cap" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (anterior al 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i posterior)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Separa a l'espai" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Separa a l'espai o puntuació" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Copia l'element seleccionat al directori indicat" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Copia l'element seleccionat en un directori a triar" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Suprimeix els elements seleccionats a l'esquerra" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Suprimeix els elements seleccionats a la dreta" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Suprimeix els element(s) seleccionat(s) a ambdues bandes" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Amaga el(s) element(s) seleccionat(s) (filtratge al vol)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Canvia el nom de l'element seleccionat a ambdós costats" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Dreta a esquerra (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Esquerra a dreta (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Dreta a esquerra (%1 de %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Esquerra a dreta (%1 de %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Esquerra a... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Dreta a... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Esquerra a... (%1 de %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Dreta a... (%1 de %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Esquerra (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Dreta (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Ambdós (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerra (%1 de %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Dreta (%1 de %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Ambdós (%1 de %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Selecciona la carpeta de destinació" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Costat esquerre - seleccioneu la carpeta de destinació:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Costat dret - seleccioneu la carpeta de destinació:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fitxers afectats)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 fitxers afectats)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Esteu segur que voleu copiar totes les diferències al fitxer de l'esquerra?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Esteu segur que voleu copiar totes les diferències al fitxer de la dreta?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4052,17 +4059,17 @@ msgstr "" "a \n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Esteu segur que voleu copiar %1 de %2 element(s) seleccionat(s)?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Esteu segur que voleu suprimir %1 del(s) %2 element(s) seleccionat(s)?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4073,7 +4080,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4084,17 +4091,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Esteu segur que voleu copiar:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Esteu segur que voleu copiar %d elements:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4113,458 +4120,458 @@ msgstr "" "\n" "Actualitzeu la comparació." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Obre el fitxer de l'esquerra" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Obre el fitxer de l'esquerra en un editor extern" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Obre el fitxer de l'esquerra amb..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Obre el fitxer de la dreta" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Obre el fitxer de la dreta en un editor extern" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Obre el fitxer de la dreta amb..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "No s'ha pogut executar l'editor extern: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Extensió desconeguda a l'editor extern: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Copia els noms dels fitxers al Porta-retalls" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copia el camí al fitxer de l'esquerra al Porta-retalls" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copia el camí al fitxer de la dreta al Porta-retalls" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copia els camins als fitxers d'ambdós costats al Porta-retalls" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "El format de l'arxiu és desconegut" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Afegeix els elements del costat esquerre a l'arxiu" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Afegeix els elements del costat dret a l'arxiu" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Afegeix els elements d'ambdós costats a l'arxiu" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Afegeix els elements diferents a l'arxiu (d'ambdós costats)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Mou els fitxers seleccionats de l'esquerra al directori especificat" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Mou els fitxers seleccionats de la dreta al directori especificat" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Nom" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Directori" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Resultat de la comparació" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Data esquerra" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Data dreta" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Extensió" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Mida esquerra" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Mida dreta" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Mida dreta (breu)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Mida esquerra (breu)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Data de creació esquerra" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Data de creació dreta" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Fitxer més nou" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Versió del fitxer esquerra" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Versió del fitxer dreta" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Resultat breu" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Atributs esquerra" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Atributs dreta" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Salt de línia esquerra" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Salt de línia dreta" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Codificació esquerra" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Codificació dreta" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Diferències ignorades" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Diferències" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binari" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "No es pot comparar els fitxers" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Element avortat" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Fitxer omès" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Directori omès" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Només esquerra: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Només dreta: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Els fitxers binaris són idèntics" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Els fitxers binaris són diferents" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Els fitxers són diferents" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Només l'esquerre" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Només el dret" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps transcorregut: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 element seleccionat" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 elements seleccionats" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Nom del fitxer o directori." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom del subdirectori quan s'incloguin els subdirectoris." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparació, en forma llarga." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Data de modificació del costat esquerre." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Data de modificació del costat dret." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Extensió del fitxer." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Mida en bytes del fitxer esquerre." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Mida en bytes del fitxer dret." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Mida del fitxer esquerre en format abreujat." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Mida del fitxer dret en format abreujat." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Data de creació del fitxer esquerre." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Data de creació del fitxer dret." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Diu quin costat te una data de modificació més recent." -#: Merge.rc:2301 +#: Merge.rc:2304 #, 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:2302 +#: Merge.rc:2305 #, 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:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Resultat breu de la comparació." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Atributs del costat esquerre." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Atributs del costat dret." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Tipus de salt de línia del fitxer del costat esquerre" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Tipus de salt de línia del fitxer del costat dret" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Codificació del costat esquerre." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Codificació del costat dret." -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisc (*) si el fitxer és binari." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Compara %1 amb %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Llista delimitada per comes" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Llista delimitada per tabulacions" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "HTML símple" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "XML símple" -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4573,47 +4580,47 @@ msgstr "" "Hi ha hagut un error creant l'informe:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "L'informe s'ha creat satisfactòriament." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "El mateix fitxer és obert a ambdues subfinestres." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Els fitxers seleccionats són idèntics." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "La carpeta seleccionada només existeix a un altra banda i per tant no es pot obrir." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "S'ha produït un error en comparar els fitxers." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Els fitxers binaris no es poden comparar visualment." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Els fitxers de directori no es poden comparar visualment." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4628,7 +4635,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4639,22 +4646,22 @@ msgstr "" "Amb les opcions actual, s'unificaran al tipus principal.\n" "Voleu canviar les opcions i preservar les diferents menes de salt de línia?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Hi ha hagut un error prediferenciant el fitxer '%1' amb el connector '%2'. No es tornarà a aplicar la prediferenciació." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada és invàlida." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "No es poden obrir fitxers binaris a l'editor." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4665,132 +4672,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Advertiment: Els fitxers empren codificacions diferents, l'esquerre=%s i el dret=%s, i en combinar-los es podria perdre informació." -#: Merge.rc:2356 +#: Merge.rc:2359 #, 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:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "S'ha perdut informació degut a errors de codificació: fitxer dret" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "S'ha perdut informació degut a errors de codificació: fitxer esquerre" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Sense diferències" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Diferència de línia" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "S'ha(n) substituït %1 cadena(s)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "No s'ha trobat la cadena \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Copia el camí sencer del fitxer" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Copia el nom del fixer" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Subfinestra d'ubicació" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Subfinestra de diferències" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "El pedaç s'ha generat satisfactòriament." -#: Merge.rc:2393 +#: Merge.rc:2396 #, 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:2394 +#: Merge.rc:2397 #, 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:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 fitxers seleccionats]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Unificat" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "No s'ha pogut escriure al fitxer %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, 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:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Especifiqueu un fitxer de sortida" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "No es pot crear un pedaç de fitxers binaris." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "No es pot crear un pedaç de directoris." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4801,17 +4808,17 @@ msgstr "" "\n" "Cal que no hi hagi cap fitxer pendent de salvar per tal de crear un pedaç." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existeix." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "S'esborraran els resulats actuals de la comparació de directoris." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4822,7 +4829,7 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4831,7 +4838,7 @@ msgstr "" "\n" "Nota: La integració del 7-Zip està desabilitada des dels ajustos del WinMerge." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4840,37 +4847,37 @@ msgstr "" "\n" "Nota: La integració del 7-Zip està restringida com a operació independent des dels ajustos del WinMerge." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Trieu el fitxer per a exportar" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Trieu el fitxer per a importar" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "S'ha importat les opcions des del fitxer." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "S'ha exportat les opcions al fitxer." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "No s'ha pogut importar les opcions del fitxer." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "No s'ha pogut escriure les opcions al fitxer." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4878,1098 +4885,1098 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Hi ha un error a l'expressió regular" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "No s'ha trobat cap coincidència" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "L'expressió regular és invàlida" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "El caràcter de col·lació és invàlid" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "El nom de la classe de caràcter és invàlid" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Hi ha una barra inversa al final" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "La referència vers enrere és invàlida" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Una construcció [ o [^ està desaparellada" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Una construcció ( o \\( està desaparellada" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Una construcció \\{ està desaparellada" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "El contingut de la construcció \\{\\} és invàlid" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "El final del rang és invàlid" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Sense memòria" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "L'expressió regular precedent és invàlida" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "L'expressió regular acaba prematurament" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "L'expressió regular és massa llarga" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Una construcció ) o \\) està desaparellada" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanès" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Àrab (Aràbia Saudita)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Àrab (Iraq)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Àrab (Egipte)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Àrab (Líbia)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Àrab (Algèria)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Àrab (Marroc)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Àrab (Tunísia)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Àrab (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Àrab (Iemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Àrab (Síria)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Àrab (Jordània)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Àrab (Líban)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Àrab (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Àrab (Unió dels Emirats Àrabs)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Àrab (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Àrab (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armeni" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Àzeri (Llatí)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Àzeri (Ciríl·lic)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Basc" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Bielorús" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Búlgar" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Català" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Xinès (Tradicional)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Xinès (Simplificat)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Xinès (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Xinès (Singapur)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Xinès (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Croat" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Txec" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Danès" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Neerlandès" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Neerlandès (Bèlgica)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Anglès (Estats Units)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Anglès (Regne Unit)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Anglès (Austràlia)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Anglès (Canadà)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Anglès (Nova Zelanda)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Anglès (Irlandès)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Anglès (Sud-Àfrica)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Anglès (Jamaica)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Anglès (Carib)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Anglès (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Anglès (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Anglès (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Anglès (Filipines)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Estonià" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Feroès" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Finès" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Francès" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Francès (Bèlgica)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Francès (Canadà)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Francès (Suïssa)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Francès (Luxemburg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Francès (Mònaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgià" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Alemany (Alemanya)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Alemany (Suïssa)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Alemany (Àustria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Alemany (Luxemburg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Alemany (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Grec" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebreu" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Hongarès" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Islandès" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesi" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italià" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italià (Suïssa)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japonès" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Coreà" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Coreà (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Letó" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lituà" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malai (Malàisia)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malai (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Noruec (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Noruec (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polonès" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugès" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugès (Brasil)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Romanès" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Rus" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sànscrit" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbi (Llatí)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbi (Ciríl·lic)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Eslovac" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Eslovè" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Castellà" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Castellà (Mèxic)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Castellà (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Castellà (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Castellà (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Castellà (Panamà)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Castellà (República Dominicana)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Castellà (Veneçuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Castellà (Colòmbia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Castellà (Perú)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Castellà (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Castellà (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Castellà (Xile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Castellà (Uruguai)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Castellà (Paraguai)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Castellà (Bolívia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Castellà (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Castellà (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Castellà (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Castellà (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Suahili (Kènia)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Suec" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Suec (Finlàndia)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tàmil" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Tai" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turc" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ucraïnès" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (Índia)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbek (Llatí)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbek (Ciríl·lic)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamita" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Europeu occidental" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Europeu oriental" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Est asiàtic" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "Sudest i sudoest asiàtic" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Orient Mitjà" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "No aplicable" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Ciríl·lic" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Llatí US" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Àrab" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grec" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Bàltic Rim" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Llatí 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grec 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Llatí 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Ciril·lic" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turc" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguès" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandès" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreu" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Canada francès" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nòrdic" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Ciril·lic CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grec 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Tai" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japonès" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Xinès simplificat" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Koreà" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Xinès tradicional" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Llatí 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Ciril·lic (Eslau)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Llatí 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Grec" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Llatí 5 (Turc)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreu" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Àrab" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Bàltic Rim" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamita" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romà" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grec" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Ciril·lic" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europa central" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turc" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Semblant a ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Semblant a ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Semblant a ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Semblant a ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Semblant a ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Barrejat" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Desa el fitxer de l'esquerra" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Desa el fitxer de la dreta" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Desa i anomena el fitxer de l'esquerra..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Desa i anomena el fitxer de la dreta..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Canvia l'estat de només de lectura per al fitxer de l'esquerra" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Canvia l'estat de només de lectura per al fitxer de la dreta" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Converteix el salt de línia al mode del DOS" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Converteix el salt de línia al mode del UNIX" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Converteix el salt de línia al mode del MAC" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Commuta entre els modes d'edició i el de combinació" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5978,12 +5985,12 @@ msgstr "" "Mostra i ajusta les propietats de codificació de fixter\n" "Propietats de codificació de fitxer" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5992,7 +5999,7 @@ msgstr "" "Selecciona l'àrea de diferència a la línia actual\n" "Diferència a la línia actual (F4)" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6001,7 +6008,7 @@ msgstr "" "Va fins a una línia o una diferència\n" "Vés a (Control+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6010,7 +6017,7 @@ msgstr "" "Especifica opcions del programa\n" "Opcions" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6019,37 +6026,37 @@ msgstr "" "Actualitza la visualització\n" "Actualitza (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copia les línies seleccionades al Porta-retalls afegint-hi els números de línia al inici de línia" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Actualitza els elements seleccionats" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Activa/desactiva el punt d'interès" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Va al següent punt d'interès" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Va al punt d'interès anterior" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Esborra tots els punts d'interès" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6058,7 +6065,7 @@ msgstr "" "Visualitza els elements que singuin exactament iguals\n" "Mostra elements idèntics" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6067,7 +6074,7 @@ msgstr "" "Visualitza els elements que tinguin diferències\n" "Mostra elements diferents" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6076,7 +6083,7 @@ msgstr "" "Visualitza els elements existents únicament a l'esquerra\n" "Mostra elements únics de l'esquerra" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6085,7 +6092,7 @@ msgstr "" "Visualitza els elements existents únicament a la dreta\n" "Mostra elements únics de la dreta" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6094,7 +6101,7 @@ msgstr "" "Visualitza els elements binaris\n" "Mostra elements binaris" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6103,7 +6110,7 @@ msgstr "" "Visualitza els elements omesos\n" "Mostra elements omesos" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6112,7 +6119,7 @@ msgstr "" "Selecciona el tipus de lletra per a les visualitzacions de diferències\n" "Selecciona tipus de lletra per a diferències" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6121,27 +6128,27 @@ msgstr "" "Recupera el tipus de lletra del sistema per a la visualització de diferències\n" "Tipus de lletra del sistema" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Mostra els caràcters d'espais" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Mostra la subfinestra de diferències" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Mostra la subfinestra d'ubicació amb una image general dels fitxers" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostra el quadre de diàleg d'estadístiques de comparació de carpeta" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6150,7 +6157,7 @@ msgstr "" "Selecciona l'idioma de la interfície d'usuari\n" "Idioma" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6159,12 +6166,12 @@ msgstr "" "Mostra les diferències dins les línies en un color diferent\n" "Mostra les diferències de línia" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Intercanvia la posició d'ambdues subfinestres" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6173,7 +6180,7 @@ msgstr "" "Mostra els números de línia\n" "Mostra els números de línia" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6182,7 +6189,7 @@ msgstr "" "Permet l'ajustament de paraules\n" "Ajusta les línies" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6191,17 +6198,17 @@ msgstr "" "Mostra els marges de selecció per a ambdós subfinestres\n" "Mostra els marges de selecció" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6210,7 +6217,7 @@ msgstr "" "Es desplaça fins a la diferència anterior\n" "Diferència anterior (Alt+Amunt)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6219,7 +6226,7 @@ msgstr "" "Es desplaça fins a la següent diferència\n" "Propera diferència (Alt+Avall)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6228,7 +6235,7 @@ msgstr "" "Es desplaça fins a la primera diferència\n" "Primera diferència (Alt+Inici)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6237,7 +6244,7 @@ msgstr "" "Es desplaça fins a la diferència actual\n" "Diferència actual (Alt+Retorn)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6246,7 +6253,7 @@ msgstr "" "Es desplaça fins a la darrera diferència\n" "Darrera diferència (Alt+Fi)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6255,7 +6262,7 @@ msgstr "" "Copia el text seleccionat al fitxer de la dreta\n" "Copia al fitxer de la dreta (Alt+Dreta)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6264,7 +6271,7 @@ msgstr "" "Copia el text seleccionat al fitxer de l'esquerra\n" "Copia al fitxer de l'esquerra (Alt+Esquerra)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6273,7 +6280,7 @@ msgstr "" "Copia la diferència a la dreta i avança a al següent\n" "Copia a la dreta i avança (Control+Alt+Dreta)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6282,7 +6289,7 @@ msgstr "" "Copia la diferència a l'esquerra i avança a la següent\n" "Copia a l'esquerra i avança (Control+Alt+Esquerra)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6291,7 +6298,7 @@ msgstr "" "Copia totes les diferènces al fitxer de la dreta\n" "Tot a la dreta" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6300,72 +6307,72 @@ msgstr "" "Copia totes les diferènces al fitxer de l'esquerra\n" "Tot a l'esquerra" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Suprimeix els elements seleccionats d'ambdós directoris" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Compara l'element seleccionat (compara el primer element en cas de selecció múltiple)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Tria i reordena les columnes de comparació de directoris" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Genera un fitxer de pedaços" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Tria i modifica els filtres" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Genera un informe a partir dels resultats de comparació" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "L'usuari tria el desempaquetador (no hi ha desempaquetament en comparar directoris)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Tria un desempaquetador per a editar aquest fitxer" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "No prediferencia (normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Connectors suggerits" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Altres connectors" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarrega el connectoris i els torna a carregar (per a desenvolupadors)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6374,12 +6381,12 @@ msgstr "" "Activa el següent fitxer visible\n" "Activa següent fitxer" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Tanca totes les finestres obertes" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6388,22 +6395,22 @@ msgstr "" "Visualitza la Guia de l'Usuari del WinMerge\n" "Ajuda" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Treu informació de versió i configuració actuals del WinMerge en un fitxer de text" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Mostra la Llicència Pública General de GNU" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Muntatge privat: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6412,7 +6419,7 @@ msgstr "" "Obre l'índex de l'ajuda del WinMerge\n" "Índex de l'ajuda" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6421,267 +6428,272 @@ msgstr "" "Obre la cerca a l'ajuda del WinMerge\n" "Cerca a l'ajuda" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Ajustos del connector" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "No prediferenciïs" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Prediferencia quan sigui possible" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "No s'ha trobat el WSH - seqüències d'ordres .sct inhabilitades" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Obre el fitxer amb l'apliació registrada" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Obre el fitxer amb l'editor extern" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Obre el fitxer amb una aplicació particular" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "No mostra els blocs moguts" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Mostra tots els blocs moguts" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mostra només els blocs moguts des de la diferència actual" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Va fins a la diferència sota la busca" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Va fins a la diferència %1 de %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "Va fins a la línia %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Inhabilitat" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Des del sistema de fitxers" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Des de la llista de recents" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Amaga la barra d'eines" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Mostra la barra d'eines petita" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Mostra la barra d'eines gran" diff --git a/Src/Languages/ChineseSimplified.po b/Src/Languages/ChineseSimplified.po index a9f3fd9e3..855f94124 100644 --- a/Src/Languages/ChineseSimplified.po +++ b/Src/Languages/ChineseSimplified.po @@ -72,7 +72,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "¸´ÖÆ(&C)" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "Õ³Ìù(&P)" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "תµ½(&G)..." @@ -95,43 +95,43 @@ msgid "Op&en" msgstr "´ò¿ª(&E)" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "ÓÃĬÈϳÌÐò(&R)" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "ÓÃÍⲿ±à¼­Æ÷(&E)" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "Ñ¡Ôñ³ÌÐò(&W)..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "Îļþ(&F)" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "н¨(&N)\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "´ò¿ª(&O)...\tCtrl+O" @@ -147,8 +147,8 @@ msgid "Open Project...\tCtrl+J" msgstr "´ò¿ª¹¤³Ì...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "±£´æ¹¤³Ì(&V)..." @@ -159,1845 +159,1852 @@ msgid "Recent Projects" msgstr "×î½ü´ò¿ªµÄ¹¤³Ì" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "Í˳ö(&X)" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "±à¼­(&E)" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "Ñ¡Ïî(&O)..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "ÊÓͼ(&V)" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Ñ¡Ôñ×ÖÌå(&F)..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "ʹÓÃĬÈÏ×ÖÌå(&O)" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "¹¤¾ßÀ¸(&T)" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "ÎÞ(&N)" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "С(&S)" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "´ó(&B)" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "״̬À¸(&S)" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "±êÇ©À¸(&B)" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "ÓïÑÔ(&L)..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "¹¤¾ß(&T)" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "¹ýÂËÆ÷(&F)..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "Éú³É Patch(&G)..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "²å¼þ(&P)" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "ÊÖ¶¯½â°ü(&M)" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "×Ô¶¯½â°ü(&A)" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "Óýâ°ü³ÌÐò´ò¿ª(&E)" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "ÖØÐÂ×°Èë²å¼þ(&R)" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "µ÷ÊÔ(&D)" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "ÔØÈëÅäÖÃ(&L)..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "ÖØÖÃÑ¡Ïî(&R)" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "´°¿Ú(&W)" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "¹Ø±Õ" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "È«²¿¹Ø±Õ(&S)" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Çл»´°¸ñ(&P)\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "ˮƽ²¢ÅÅ(&H)" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "´¹Ö±²¢ÅÅ(&V)" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "Öصþ(&C)" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "°ïÖú(&H)" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "Óû§ÊÖ²á(&C)...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "Ë÷Òý(&I)..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "ËÑË÷(&S)..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "²é¿´ÅäÖÃ(&O)..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "ѹËõ°üÖ§³ÖÒѽûÓÃ(&R)..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "GNU ¹«¹²ÊÚȨ..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "¹ØÓÚ WinMerge(&A)..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "´ò¿ª¹¤³Ì...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "×ó²àÖ»¶Á(&E)" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "ÓÒ²àÖ»¶Á(&G)" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "Îļþ±àÂë(&C)" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Ñ¡ÔñËùÓÐ(&A)\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "ÏÔʾÍêÈ«ÏàͬµÄÏîÄ¿(&I)" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "ÏÔʾ²»ÏàͬµÄÏîÄ¿(&D)" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "ÏÔʾֻÔÚ×ó²àµÄÏîÄ¿(&E)" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "ÏÔʾֻÔÚÓÒ²àµÄÏîÄ¿(&G)" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "ÏÔʾÌø¹ýµÄÏîÄ¿(&K)" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "ÏÔʾ¶þ½øÖÆÏîÄ¿(&H)" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "ÏÔʾÒþ²ØµÄÏîÄ¿(&E)" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "¶Ô±È½á¹ûͳ¼Æ(&R)" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "Ë¢ÐÂ(&S)\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Ë¢ÐÂÑ¡ÖÐÏî(&R)\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "ºÏ²¢(&M)" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "¶Ô±È(&M)\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "ÏÂÒ»´¦²»Í¬(&N)\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "ÉÏÒ»´¦²»Í¬(&P)\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "µÚÒ»´¦²»Í¬(&F)\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "µ±Ç°²»Í¬(&C)\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "×îºóÒ»´¦²»Í¬(&D)\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "¸´ÖƵ½ÓÒ²à(&R)\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "¸´ÖƵ½×ó²à(&L)\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "ɾ³ý(&D)\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "Ñ¡ÔñÁÐ(&C)..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Éú³É±¨¸æ(&R)..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "±£´æ(&S)\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "±£´æ×ó²à(&L)" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "±£´æ(&S)" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Áí´æΪ(&A)..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "±£´æÓÒ²à(&R)" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "´òÓ¡(&P)..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "Ò³ÃæÉèÖÃ(&T)" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "´òÓ¡Ô¤ÀÀ" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "½«Ðзָô·ûת»»Îª(&C)" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "ºÏ²¢Ä£Ê½\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "³·Ïú(&U)\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Öظ´(&R)\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "¼ôÇÐ(&U)\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "¸´ÖÆ(&C)\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "Õ³Ìù(&P)\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Ñ¡ÖÐÐÐÖв»Í¬(&D)\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "²éÕÒ(&I)...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Ìæ»»(&C)...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "½Å±¾(&S)" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< ¿Õ >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "¸ß¼¶" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "´øÐкŸ´ÖÆ(&C)\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "ÊéÇ©(&B)" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ÉèÖÃ/È¡Ïû(&T)\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "ÏÂÒ»¸ö(&N\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "ÉÏÒ»¸ö(&P)\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "Çå³ýËùÓÐ(&C)" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "תµ½(&G)...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Óï·¨¸ßÁÁ" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "ÏÔʾ¿Õ°×ºÍÖƱí·û(&V)" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "ÏÔʾÐÐÖв»Í¬(&W)" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "ÏÔʾÐкÅ(&N)" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "ÏÔʾҳ±ß(&M)" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "×Ô¶¯»»ÐÐ(&R)" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "½»»»×óÓÒ´°¸ñ(&A)" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "¶Ô±È´°¸ñ(&P)" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "λÖô°¸ñ(&C)" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "¸´ÖƵ½ÓҲಢǰ½ø\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "¸´ÖƵ½×ó²à²¢Ç°½ø\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "È«²¿¸´ÖƵ½ÓÒ²à(&A)" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "È«²¿¸´ÖƵ½×ó²à(&E)" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "Ô¤¶Ô±È(&P)" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "¶Ô±È(&A)" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "´Ó×óµ½ÓÒ(&L)" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "´Ó×óµ½(&E)..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "´ÓÓÒµ½×ó(&R)" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "´ÓÓÒµ½(&I)..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "Òƶ¯(&M)" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "´Ó×óµ½(&L)..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "´ÓÓÒµ½(&R)..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "ɾ³ý(&D)" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "×ó²à(&L)" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "ÓÒ²à(&R)" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "Á½²à(&B)" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "¸ÄÃû(&N)" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "Òþ²Ø(&H)" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "´ò¿ª×ó²à(&O)" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "´ò¿ªÓÒ²à(&P)" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "¸´ÖÆÈ«Ãû(&Y)" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "×ó²à(&L)(%1¸ö ¹²%2¸ö)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "ÓÒ²à(&R)(%1¸ö ¹²%2¸ö)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "Á½²à(&B)(%1¸ö ¹²%2¸ö)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "¸´ÖÆÎļþÃû(&F)" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "×ó²à(&L)...(%1¸ö ¹²%2¸ö)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "ÓÒ²à(&R)...(%1¸ö ¹²%2¸ö)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "Á½²à(&B)...(%1¸ö ¹²%2¸ö)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Á½²à²»Í¬(&D)...(%1¸ö ¹²%2¸ö)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "Ë¢ÐÂ(&R)" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "¸´ÖÆÈ«Ãû(&C)" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "¸´ÖÆÎļþÃû(&F)" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Ô¤¶Ô±ÈÉèÖÃ" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "²»Ê¹ÓÃ(&N)" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "×Ô¶¯" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "תµ½²»Í¬(&O)" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "²»ÏÔʾÒƶ¯Çø¿é(&N)" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "ËùÓÐÒƶ¯Çø¿é(&A)" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "µ±Ç°²»Í¬´¦Òƶ¯Çø¿é(&C)" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "¹ØÓÚ WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "±£ÁôËùÓÐȨÀû¡£" -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "·ÃÎÊ WinMerge Ê×Ò³!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "È·¶¨" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Ñ¡ÔñÎļþ»òÎļþ¼Ð..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "×ó²à(&L):" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "ä¯ÀÀ(&B)..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "ÓÒ²à(&R):" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "ä¯ÀÀ(&W)..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "¹ýÂËÆ÷(&F):" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Ñ¡Ôñ..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "½â°ü³ÌÐò(&U):" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Ñ¡Ôñ..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "°üº¬×ÓĿ¼(&I)" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "״̬:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "È¡Ïû" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "°ïÖú" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Òª¶Ô±ÈµÄÎļþ»òÎļþ¼Ð" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Êý¾Ý¿â:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "¹¤³Ì:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Óû§Ãû:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "ÃÜÂë:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Á¬½Óµ½Ä¿±ê VSS ¹¤³Ì" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Ó¦ÓÃÓÚËùÓÐÏîÄ¿" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Ç©³ö" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Áí´æΪ..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "°æ±¾¿ØÖÆϵͳ" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "°æ±¾¿ØÖÆϵͳ(&V)" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe ·¾¶(&P):" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "³£¹æ" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "×Ô¶¯¹ö¶¯µ½µÚÒ»´¦²»Í¬(&S)" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "Í£ÓÃÆô¶¯ÆÁÄ»(&D)" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "ESC¹Ø±Õ´°¿Ú(&O)" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "ÔÚ¡°´ò¿ª¡±¶Ô»°¿òÖÐ×Ô¶¯Ñé֤·¾¶" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "Ö»ÔÊÐíÔËÐÐÒ»¸öʵÀý(&A)" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "¡°´ò¿ª¡±¶Ô»°¿ò×Ô¶¯Íê³É(&P):" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "ÔÊÐí¶à¸ö¶Ô±È´°¿Ú" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Îļþ¼Ð¶Ô±È(&F)" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Îļþ¶Ô±È(&E)" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMergeÔÊÐíÒþ²ØһЩ³£¼ûµÄÌáʾÐÅÏ¢, µã»÷¡°ÖØÖá±°´Å¥¿ÉÒÔʹÒþ²ØµÄÐÅÏ¢ÐÂÏÔʾ." -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "ÖØÖÃ" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "ÓïÑÔ" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "¿ÉÓõÄÓïÑÔ:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "²éÕÒ" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "²éÕÒÄÚÈÝ(&N):" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "È«×ÖÆ¥Åä(&W)" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Çø·Ö´óСд(&C)" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "ʹÓÃÕýÔò±í´ïʽ(&E)" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "µ½Îļþβºó²»ÔÙ´ÓÍ·²éÕÒ(&O)" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "·½Ïò" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "ÏòÉÏ(&U)" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "ÏòÏÂ(&D)" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "ÕÒÏÂÒ»¸ö(&F)" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Ìæ»»" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Ì滻Ϊ(&P):" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "ÖÁÎļþĩβ²»ÔÙ´ÓÍ·ËÑË÷(&D)" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Ìæ»»·¶Î§" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "Ñ¡ÖÐÄÚÈÝ(&S)" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "Õû¸öÎļþ(&O)" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "Ìæ»»(&R)" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "È«²¿Ìæ»»(&A)" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "µ÷ÊÔ" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Åú×¢" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "ÐйýÂËÆ÷" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "ºöÂÔ·ûºÏÏÂÁÐÑùʽµÄÐÐ" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "ÕýÔò±í´ïʽ (ÿÐÐÒ»¸ö):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "±£´æ" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "н¨" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "±à¼­" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "ɾ³ý" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "ÑÕÉ«" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "²»Í¬:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "ÒÑÑ¡Ôñ:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "±³¾°" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "ÒÑɾ³ý" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "ÎÄ×Ö" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "ÂÔ¹ýµÄ²»Í¬:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Òƶ¯Çø¿é:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Ñ¡ÖеÄÒƶ¯Çø¿é:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "´ÊÓﲻͬ:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Ñ¡ÖеĴÊÓﲻͬ:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "ĬÈÏ" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "ϵͳ" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "½«É¾³ýµÄÎļþÒÆÖÁ»ØÊÕÕ¾(&S)" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "ºöÂÔ²»×ã3ÃëµÄʱ¼ä²î±ð" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "¼¯³É" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "Ìí¼Óµ½×ÊÔ´¹ÜÀíÆ÷µÄÓÒ¼ü²Ëµ¥ÖÐ(&A)" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "ÔÊÐí¸ß¼¶²Ëµ¥(&N)" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "ĬÈÏ°üº¬×ÓÎļþ¼Ð(&C)" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "Íⲿ±à¼­Æ÷(&E)" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "¹ýÂËÆ÷·¾¶(&F):" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "ä¯ÀÀ..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "PatchÉú³ÉÆ÷" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Îļþ&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Îļþ&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "ä¯ÀÀ(&O)..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "ÉÏϽ»»»(&S)" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "Ìí¼Óµ½ÒÑÓÐÎļþµÄĩβ(&A)" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "½á¹û(&R):" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "¸ñʽ(&F)" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "Ñùʽ(&Y):" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "ÄÚÈÝ(&C):" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "¿Õ°×(&H)" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "¶Ô±È(&P)" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "ºöÂԱ仯(G)" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "ºöÂÔËùÓÐ(&N)" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "ºöÂÔ¿ÕÐÐ(&E)" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Çø·Ö´óСд(&T)" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "°üº¬ÃüÁîÐÐ(&D)" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ª(&X)" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Ñ¡ÔñÏÔʾÁÐ" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Ñ¡Ôñ½â°ü³ÌÐò" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Îļþ½â°ü³ÌÐò:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "²»¼ì²éÀ©Õ¹Ãû£¬ÏÔʾËùÓнâ°ü³ÌÐò¡£" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "À©Õ¹Ãû:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "ÃèÊö:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "Îļþ¼Ð¶Ô±È½ø¶È" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Í£Ö¹" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "ÕýÔÚ¶Ô±È..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "ÒѶԱÈ:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "×ÜÊý:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "תµ½" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "תµ½(&O):" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Îļþ" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "תµ½Àà±ð" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "ÐÐ(&N)" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "²»Í¬´¦(&D)" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "תµ½(&G)" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "¶Ô±È" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "¿Õ°×" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "¶Ô±È¿Õ°×ºÍÖƱí·û(&W)" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "ºöÂԿհ׺ÍÖƱí·û¸ü¸Ä(&H)" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "ºöÂÔËùÓпհ׺ÍÖƱí·û(&A)" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "ºöÂÔ¿ÕÐÐ(&K)" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "ºöÂÔ´óСд(&E)" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "ºöÂÔ»»Ðзû²î±ð(&R) (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "ÔÊÐí¼ì²âÒƶ¯Çø¿é(&N)" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "Æ¥ÅäÏàËƵÄÐÐ(&M)" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Îļþ¶Ô±È·½·¨(&F)" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "Óöµ½Ê×´¦²»Í¬ºóÍ£Ö¹(&T)" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "¹ýÂË×¢ÊÍ" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "±à¼­Æ÷" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Óï·¨¸ßÁÁ(&H)" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "×Ô¶¯ÖØÐÂɨÃè(&R)" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "±£³ÖԭʼµÄ»»Ðзû(&P)" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "ÖƱí·û" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "¿í¶È(&T)" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "²åÈëÖƱí·û(&T)" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "²åÈë¿Õ¸ñ(&N)" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "ÐÐÖжԱÈ" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "ÏÔʾÐÐÖв»Í¬" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "×Ö·û¼¶±ð(&C)" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "µ¥´Ê¼¶±ð(&W):" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Îļþ¹ýÂËÆ÷" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "²âÊÔ" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "°²×°..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "н¨..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "±à¼­..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "ɾ³ý..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "±£´æÐ޸ĺóµÄÎļþÂð£¿" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "×ó²àÎļþ" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "±£´æÐÞ¸Ä(&S)" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "·ÅÆúÐÞ¸Ä(&D)" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "ÓÒ²àÎļþ" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "±£´æÐÞ¸Ä(&A)" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "·ÅÆúÐÞ¸Ä(&C)" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "·ÅÆúËùÓÐÐÞ¸Ä" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "´úÂëÒ³" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "ĬÈÏ´úÂëÒ³" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "ÇëÑ¡Ôñ´ò¿ª·ÇUnicodeÎļþʱĬÈϵĴúÂëÒ³" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2006,32 +2013,32 @@ msgstr "" "¶ÔÒÔÏÂÎļþ½øÐдúÂëÒ³¼ì²â : .html, .rc, .xml\n" "ÐèÒªÖØÐÂÆô¶¯WinMerge" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "ϵͳ´úÂëÒ³" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Óë WinMerge Óû§½çÃæÒ»ÖÂ" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Ö¸¶¨´úÂëÒ³ :" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - ѹËõ°üÖ§³ÖÒѽûÓÃ" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "ÎÞ·¨¼ì²â 7-Zip °æ±¾ (ûÓа²×°?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2040,24 +2047,24 @@ msgstr "" "ѹËõ°üÖ§³ÖÐèÒªÄúµÄ¼ÆËã»úÉÏ°²×°ÓÐ 7-Zip 3.11 »ò¸ü¸ßµÄ°æ±¾£¬\n" "»òÊǽ«ËüµÄ×é¼þ¸´ÖƵ½±¾³ÌÐòµÄÎļþ¼ÐÖÐÒÔ¹©µ¥¶ÀʹÓá£" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "ÔÚ²å¼þ·¾¶Öл¹ÐèÒªÓÐÊʵ±µÄ½Ó¿Ú²å¼þ(Merge7z*.dll)¡£" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "ÔÚ¶ÔÓ¦ÓÚ×îаæ7-ZipµÄ²å¼þÃæÊÀ֮ǰ£¬ÇëʹÓÃÒÔÏÂÍƼöµÄ°æ±¾¡£" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "°æ±¾" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2066,54 +2073,54 @@ msgstr "" "ÐèÒªµÄ²å¼þ\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "ÍƼöµÄ 7-Zip °æ±¾£º" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "ÏÖ´æ" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Äú¼ÆËã»úÉÏ°²×°µÄ 7-Zip £º" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "ÎÞ" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "ûÓÐ" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "¹©µ¥¶ÀʹÓÃµÄ 7-Zip ×é¼þ£º" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "¹ýÆÚ" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "·¾¶ÖеIJå¼þ£º" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2122,486 +2129,486 @@ msgstr "" "²»ÔÙÏÔʾ´ËÏûÏ¢(&M)¡£\n" "(Äú¿ÉÒÔ´Ó°ïÖú²Ëµ¥Öе÷³öÕâ¸ö¶Ô»°¿ò¡£)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "ÏÂÔزå¼þ" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Ñ¡Ïî" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " ·ÖÀà" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "µ¼Èë..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "µ¼³ö..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "¹Ø¼ü×Ö:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "º¯ÊýÃû:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "×¢ÊÍ:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Êý×Ö:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "²Ù×÷·û:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "×Ö·û´®:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Ô¤´¦ÀíÖ¸Áî:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Óû§¶¨Òå 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Óû§¶¨Òå 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "¼Ó´Ö" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Îļþ¼Ð¶Ô±È±¨¸æ" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "±¨¸æÎļþ(&F):" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "Ñùʽ(&S):" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "¸´ÖƵ½¼ôÌù°å(&C)" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "¹²Ïí»ò˽ÓйýÂËÆ÷" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "ÄúÒª´´½¨ÄÄÖÖ¹ýÂËÆ÷£¿" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "¹²Ïí¹ýÂËÆ÷(Ϊ±¾»úµÄËùÓÐÓû§)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "˽ÓйýÂËÆ÷(ֻΪµ±Ç°Óû§)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "ѹËõ°üÖ§³Ö" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "ѹËõ°üÖ§³ÖÐèÒª°²×° 7-Zip ²å¼þ:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "ÏÂÔØ 7-zip ²å¼þ" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "ÆôÓÃѹËõÎļþÖ§³Ö(&E)" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "ʹÓÃÒÑÓеĵ¥¶À 7-Zip ³ÌÐò(&U)" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "ʹÓà WinMerge Ŀ¼ÏÂ×Ô´øµÄ 7-Zip (&S)" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "ÒÀ¾ÝÊðÃû¼ì²âÎļþÀàÐÍ(&D)" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "¶Ô±È½á¹ûͳ¼Æ" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Îļþ¼Ð:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Îļþ:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "²»Í¬" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Îı¾:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "¶þ½øÖÆ:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "½öÔÚµ¥²à" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "×ó²à:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "ÓÒ²à:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "ÍêÈ«Ïàͬ" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "×ܼÆ:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "¹Ø±Õ" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Ó°Ï췶Χ" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Ñ¡ÔñҪʹÓõĴúÂëÒ³" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "´ò¿ªÎļþ(&F):" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "±£´æÎļþ(&S):" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "Á½±ßʹÓÃÏàͬµÄ´úÂëÒ³(&U)" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "Ó¦ÓÃ(&A)" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "È¡Ïû(&C)" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "¹ýÂËÆ÷²âÊÔ" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "ÕýÔÚ²âÊÔ ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "¼üÈëÎÄ×ÖÓÃÒÔ²âÊÔ(&E):" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "Îļþ¼ÐÃû(&F)" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "½á¹û:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "²âÊÔ(&T)" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "¹Ø±Õ(&C)" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "ʹÓÃ×Ô¶¨ÒåµÄÎÄ×ÖÑÕÉ«(&U)" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "×Ô¶¨ÒåÎÄ×ÖÑÕÉ«" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "¿Õ°×:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "ÆÕͨÎÄ×Ö:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Ñ¡ÖÐÇøÓò:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "·¾¶" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Ö»¶Á(&E)" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Ö»¶Á(&A)" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "´ò¿ª..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "±£´æ..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "±¸·ÝÎļþ" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "½øÐÐÒÔϲÙ×÷ʱ´´½¨±¸·ÝÎļþ:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "½«±¸·ÝÎļþ´´½¨ÖÁ:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "ԭʼÎļþËùÔÚÎļþ¼Ð(&O)" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "È«¾Ö±¸·ÝÎļþ¼Ð(&G):" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "±¸·ÝÎļþÃû:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "Ìí¼Ó .bak À©Õ¹Ãû(&A)" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "Ìí¼Óʱ¼ä´Á(&P)" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "È·Èϸ´ÖÆ" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "ÄúÈ·¶¨Òª¸´ÖÆ XXX ¸öÏîĿô?" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "´Ó×ó²à" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "µ½ÓÒ²à" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "ÊÇ" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "·ñ" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "040903a8" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by liaobin and xmpdhml" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x804, 936" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "¾ÍÐ÷" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2610,7 +2617,7 @@ msgstr "" "н¨Ò»¸ö¿ÕÎĵµ\n" "н¨ (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2619,7 +2626,7 @@ msgstr "" "´ò¿ªÒ»¸öÏÖ´æÎļþ\n" "´ò¿ª (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2628,7 +2635,7 @@ msgstr "" "¹Ø±Õµ±Ç°Îļþ\n" "¹Ø±Õ" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2637,7 +2644,7 @@ msgstr "" "±£´æµ±Ç°Îļþ\n" "±£´æ (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2646,7 +2653,7 @@ msgstr "" "ÒÔÒ»¸öÐÂÃû³Æ±£´æµ±Ç°ÖÐÎļþ\n" "Áí´æΪ" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2655,7 +2662,7 @@ msgstr "" "¸ü¸Ä´òÓ¡Ñ¡Ïî\n" "°æÃæÉ趨" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2664,7 +2671,7 @@ msgstr "" "¸ü¸Ä´òÓ¡»úºÍ´òÓ¡Ñ¡Ïî\n" "´òÓ¡É趨" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2673,7 +2680,7 @@ msgstr "" "´òÓ¡µ±Ç°Îļþ\n" "´òÓ¡" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2682,12 +2689,12 @@ msgstr "" "Ô¤ÀÀ´òÓ¡µÄЧ¹û\n" "´òÓ¡Ô¤ÀÀ" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "ÖØÐÂÏÔʾËùÓÐÒþ²ØµÄÏîÄ¿" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2696,32 +2703,32 @@ msgstr "" "´ò¿ª¹¤³ÌÎļþ\n" "´ò¿ª¹¤³Ì (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "´ò¿ª¹¤³ÌÎļþʱ·¢Éúδ֪´íÎó" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "±£´æ¹¤³ÌÎļþʱ·¢Éúδ֪´íÎó" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "¹¤³ÌÎļþ" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "³É¹¦´ò¿ª¹¤³ÌÎļþ." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "³É¹¦±£´æ¹¤³ÌÎļþ." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2730,7 +2737,7 @@ msgstr "" "°Ñµ±Ç°µÄ·¾¶ºÍÑ¡Ïî±£´æµ½¹¤³ÌÎļþ\n" "±£´æ¹¤³ÌÎļþ" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2739,7 +2746,7 @@ msgstr "" "ÏÔʾ³ÌÐòÐÅÏ¢£¬°æ±¾ºÅÂëºÍ°æȨ\n" "¹ØÓÚ" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2748,9 +2755,6 @@ msgstr "" "Í˳öÓ¦ÓóÌÐò£»Ìáʾ±£´æÎļþ\n" "Í˳ö" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2764,11 +2768,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "´ò¿ªÕâ¸öÎļþ" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2777,7 +2784,7 @@ msgstr "" "Çл»µ½ÏÂÒ»¸ö´°¿Ú\n" "ÏÂÒ»´°¿Ú" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2786,7 +2793,7 @@ msgstr "" "Çл»µ½ÉÏÒ»¸ö´°¿Ú\n" "ÉÏÒ»´°¿Ú" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2795,7 +2802,7 @@ msgstr "" "Ϊµ±Ç°Îļþ´ò¿ªÁíÒ»¸ö´°¿Ú\n" "д°¿Ú" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2804,14 +2811,14 @@ msgstr "" "ÔÚ´°¿ÚµÄµ×²¿ÅÅÁÐͼ±ê\n" "ÅÅÁÐͼ±ê" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" "Cascade Windows" msgstr "ÅÅÁд°¿ÚÈÃËüÃDZ˴˸²¸ÇnÖصþ´°¿Ú" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2820,7 +2827,7 @@ msgstr "" "·Ç¸²¸ÇµÄÅÅÁд°¿Ú\n" "²¢Áд°¿Ú" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2829,7 +2836,7 @@ msgstr "" "·Ç¸²¸ÇµÄÅÅÁд°¿Ú\n" "²¢Áд°¿Ú" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2838,7 +2845,7 @@ msgstr "" "·Ö¸îµ±Ç°´°¿Ú\n" "·Ö¸î" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2847,7 +2854,7 @@ msgstr "" "Çå³ýÑ¡ÖеÄÄÚÈÝ\n" "ɾ³ý" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2856,7 +2863,7 @@ msgstr "" "È«²¿É¾³ý\n" "È«²¿É¾³ý" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2865,7 +2872,7 @@ msgstr "" "¸´ÖÆÑ¡ÖÐÄÚÈݵ½¼ôÌù°å\n" "¸´ÖÆ" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2874,7 +2881,7 @@ msgstr "" "ɾ³ýÑ¡ÖÐÄÚÈݲ¢·ÅÖõ½¼ôÌù°å\n" "¼ôÇÐ" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2883,7 +2890,7 @@ msgstr "" "²éÕÒÖ¸¶¨ÎÄ×Ö\n" "²éÕÒ" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2892,7 +2899,7 @@ msgstr "" "²åÈë¼ôÌù°åÖеÄÄÚÈÝ\n" "Õ³Ìù" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2901,7 +2908,7 @@ msgstr "" "Öظ´ÉϴεĶ¯×÷\n" "Öظ´" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2910,7 +2917,7 @@ msgstr "" "²éÕÒÖ¸¶¨ÎÄ×Ö²¢Ìæ»»\n" "Ìæ»»" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2919,7 +2926,7 @@ msgstr "" "Ñ¡ÔñÈ«²¿ÄÚÈÝ\n" "È«Ñ¡" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2928,7 +2935,7 @@ msgstr "" "³·ÏúÉϴεĶ¯×÷\n" "³·Ïú" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2937,7 +2944,7 @@ msgstr "" "Öظ´Ö®Ç°Î´Íê³ÉµÄ¶¯×÷\n" "Öظ´" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2946,7 +2953,7 @@ msgstr "" "ÏÔʾ»òÒþ²Ø¹¤¾ßÀ¸\n" "Çл»¹¤¾ßÀ¸" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2955,7 +2962,7 @@ msgstr "" "ÏÔʾ»òÒþ²Ø״̬À¸\n" "Çл»×´Ì¬À¸" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2964,62 +2971,62 @@ msgstr "" "ÏÔʾ»òÒþ²Ø±êÇ©À¸\n" "Çл»±êÇ©À¸" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "¸ü¸Ä´°¿Ú´óС" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "¸ü¸Ä´°¿ÚλÖÃ" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "ËõС´°¿ÚΪһ¸öͼ±ê" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "À©´ó´°¿Úµ½Õû¸öÆÁÄ»" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Çл»µ½ÏÂÒ»¸öÎļþ´°¿Ú" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Çл»µ½ÉÏÒ»¸öÎļþ´°¿Ú" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "¹Ø±Õµ±Ç°´°¿Ú²¢Ìáʾ±£´æ´ËÎļþ" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "½«´°¿Ú»¹Ô­³É±ê×¼µÄ´óС" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "ÆôÓù¤×÷Çåµ¥" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "ÆôÓÃÕâ¸ö´°¿Ú" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3028,7 +3035,7 @@ msgstr "" "¹Ø±Õ´òÓ¡Ô¤ÀÀģʽ\n" "È¡ÏûÔ¤ÀÀ" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3040,175 +3047,175 @@ msgid "" "WinMerge Document" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "±£ÁôԭʼµÄ»»Ðзû" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Çë°´ÈÎÒâ¼ü" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "ÓÒ¼üµã»÷·¾¶¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "È·¶¨(&O)" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "ÖÐÖ¹(&A)" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "ÖØÊÔ(&R)" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "ºöÂÔ(&I)" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "ºöÂÔËùÓÐ(&A)" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "ÊÇ(&Y)" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "È«²¿¶¼ÊÇ(&A)" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "·ñ(&N)" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "È«²¿¶¼·ñ(&L)" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "¼ÌÐø(&C)" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "Ìø¹ý(&S)" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "È«²¿Ìø¹ý(&A)" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "²»ÔÙÌáʾ´ËÏûÏ¢(&M)¡£" -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "²»ÔÙѯÎÊ´ËÎÊÌâ(&Q)¡£" -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Óï·¨¸ßÁÁ" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Îı¾ÑÕÉ«" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "°æ±¾¿ØÖÆ" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "µ½:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "´Ó×ó²à:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "µ½×ó²à:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "´ÓÓÒ²à:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "µ½ÓÒ²à:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "°æ±¾ %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Ñ¡Ïî (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "ËùÓÐÌáʾÐÅÏ¢ÒѾ­ÖØÉèΪÏÔʾ¡£" -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "µ±Ç°ÎļþÔÚ¶Ô±ÈÆÚ¼äÒÑÓÐÐ޸ġ£ÔÚÖØÐÂÆô¶¯µ±Ç°Îļþ¶Ô±ÈÇ°£¬Ò»Ð©ÉèÖò»»áÉúЧ¡£" -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Ñ¡ÔñµÄ×ÖÌå¸ü¸Ä²»»áÓ¦Óõ½ÒѾ­´ò¿ªµÄ¶Ô±È´°¿Ú¡£" -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3219,7 +3226,7 @@ msgstr "" "\n" "ÇëʹÓà 1 - %1 Ö®¼äµÄÖµ." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3230,107 +3237,107 @@ msgstr "" "\n" "ÇëÔÚÖØÖÃÖ®ºóÖØÐÂÆô¶¯ WinMerge ." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "´ò¿ª" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "³ÌÐò|*.exe;*.bat;*.cmd|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ¹¤³ÌÎļþ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "ÅäÖÃÎļþ (*.ini)|*.ini|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Îļþ (*.htm,*.html)|*.htm;*.html|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Îļþ (*.xml)|*.xml|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "È«²¿ÄÚÈÝ" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "¿ìËÙÄÚÈÝ" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "ÐÞ¸ÄÈÕÆÚ" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "ÐÞ¸ÄÈÕÆÚºÍÎļþ´óС" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Îļþ´óС" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Ãû³Æ" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "λÖÃ" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "¹ýÂËÆ÷" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "ÃèÊö" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Ñ¡ÔñйýÂËÆ÷µÄÎļþÃû" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "¹ýÂËÆ÷Îļþ (*.flt)|*.flt|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3342,7 +3349,7 @@ msgstr "" "\n" "Çë°ÑÎļþ %1 ¸´ÖƵ½ WinMerge/Filters Îļþ¼ÐÏÂ." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3355,7 +3362,7 @@ msgstr "" "\n" "ÇëÈ·ÈÏ´ËÎļþ¼Ð´æÔÚ²¢¿ÉÒÔдÈë." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3366,7 +3373,7 @@ msgstr "" "\n" "ÇëÔÚÑ¡Ïî/ϵͳÖÐÑ¡ÔñÒ»¸ö·¾¶." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3379,12 +3386,12 @@ msgstr "" "\n" "¸ÃÎļþÊÇ·ñΪֻ¶Á?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Ñ¡ÔñÒª°²×°µÄ¹ýÂËÆ÷Îļþ" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3395,208 +3402,208 @@ msgstr "" "\n" "»òÐíÊÇÎÞ·¨½«ÐÂÎļþ¸´ÖƵ½¹ýÂËÆ÷·¾¶?" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "¹ýÂËÆ÷ÎļþÒѾ­´æÔÚ. ÊÇ·ñ¸²¸ÇÔ­ÓйýÂËÆ÷?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "ÕýÔò±í´ïʽ" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "cleartool.exe ·¾¶(&P):" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "SS.EXE ·¾¶(&P):" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Îļþ¼Ð¶Ô±È½á¹û" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Îļþ¶Ô±È" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "δÃüÃû ×ó" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "δÃüÃû ÓÒ" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "ɨÃèÎļþ..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "´ò¿ªÑ¡Ôñ" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "ÕýÔÚ´Ó×ó²à¸´ÖƵ½ÓÒ²à" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "ÕýÔÚ´ÓÓҲิÖƵ½×ó²à" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "ÕýÔÚÈ«²¿¸´ÖƵ½×ó²à" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "ÕýÔÚÈ«²¿¸´ÖƵ½ÓÒ²à" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "ÕýÔÚ¸´ÖÆÎļþ..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "ÕýÔÚɾ³ýÎļþ..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "ÕýÔÚÒƶ¯Îļþ..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "´´½¨±¨¸æ..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "ÐÐ: %s ÁÐ: %d/%d ×Ö·û: %d/%d »»Ðзû: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "ÐÐ: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "ÐÐ: %s ÁÐ: %d/%d ×Ö·û: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "ºÏ²¢" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "µÚ %1 ´¦²»Í¬(¹² %2 ´¦)" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "¹²ÕÒµ½ %1 ´¦²»Í¬" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "ÕÒµ½ 1 ´¦²»Í¬" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "Ö»¶Á" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "µÚ %1 ÏîÄ¿£¬¹² %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "ÏîÄ¿: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Ñ¡ÔñÁ½¸öÒÑ´æÔÚµÄÎļþ¼Ð»òÎļþ½øÐжԱÈ" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Ñ¡ÔñÎļþ¼Ð" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Ñ¡ÔñÒª½øÐжԱȵÄÁ½¸öÎļþ¼Ð»òÁ½¸öÎļþ¡£" -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "×ó²à·¾¶²»´æÔÚ!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "ÓҲ෾¶²»´æÔÚ!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Á½¸ö·¾¶¶¼²»´æÔÚ!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Ñ¡ÔñÁ½¸öÎļþÒÔÆôÓýâ°ü³ÌÐò." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "²»ÄÜÔÚÎļþºÍÎļþ¼ÐÖ®¼ä½øÐжԱÈ!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "ÕÒ²»µ½Îļþ: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Îļþδ½â°ü: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3609,7 +3616,7 @@ msgstr "" "\n" "ÊÇÍêÈ«ÏàͬµÄ¶þ½øÖÆÎļþ¡£" -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3622,7 +3629,7 @@ msgstr "" "\n" "ÊDz»Í¬µÄ¶þ½øÖÆÎļþ¡£" -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3633,7 +3640,7 @@ msgstr "" "\n" "ÊǶþ½øÖÆÎļþ£¬²»ÄÜÔÚ¶þ½øÖÆÎļþºÍÎı¾ÎļþÖ®¼ä½øÐжԱȡ£" -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3646,37 +3653,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Áí´æΪ" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "±£´æ¸ü¸Äµ½ %1£¿" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Ä¿±ê¿ÉдÈëÐÔ¼ì²é³ö´í" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "±¸·ÝÎļþʱ³ö´í" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3689,7 +3696,7 @@ msgstr "" "\n" "ÈÔÈ»¼ÌÐøÂð£¿" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3706,7 +3713,7 @@ msgstr "" "\t-ÓÃÆäËüÎļþÃû±£´æ(µã»÷¡°È·¶¨¡±)\n" "\t-ÖÐÖ¹µ±Ç°²Ù×÷(µã»÷¡°È¡Ïû¡±)" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3721,7 +3728,7 @@ msgstr "" "\n" "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3736,7 +3743,7 @@ msgstr "" "\n" "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3751,7 +3758,7 @@ msgstr "" "\n" "Òª¸²¸ÇÒѱ»Ð޸ĵÄÎļþÂð£¿" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3760,7 +3767,7 @@ msgstr "" "%1\n" "Îļþ±ê¼ÇΪֻ¶Á¡£ÄúÒª¸²¸ÇÖ»¶ÁµÄÎļþÂð£¿" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3775,17 +3782,17 @@ msgstr "" "\n" "ҪˢÐÂÎļþÄÚÈÝ£¬Çë¹Ø±Õµ±Ç°¶Ô±È´°¿Ú²¢ÖØдò¿ªÕâÁ½¸öÎļþ¡£" -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "×ó²àÎļþÁí´æΪ" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "ÓÒ²àÎļþÁí´æΪ" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3796,42 +3803,42 @@ msgstr "" "\n" "ÇëË¢ÐÂÎĵµºóÔÙ¼ÌÐø¡£" -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Äú±ØÐëÖ¸¶¨Ò»¸ö SourceSafe ÏîĿ·¾¶ÒÔ±ã¼ÌÐø (ÀýÈ磺 $/MyProject)" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "´ÓVSSÖÐÇ©³öÎļþ..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "ÔÚÇ©³ö(Checkout)Îļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÒ»¸ö´íÎó¡£ÎÞ·¨¼ÌÐø..." -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Ö´Ðа汾¿ØÖÆϵͳÃüÁîʱ³ö´í¡£" -#: Merge.rc:2107 +#: Merge.rc:2110 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ¹¤×÷Îļþ¼Ð(Working Folder)Ó뵱ǰÎļþλÖò»·û¡£ÊÇ·ñ¼ÌÐø£¿" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "δÕÒµ½ VSS Êý¾Ý¿â£¡" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "VSS ·µ»Ø´íÎó:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3842,7 +3849,7 @@ msgstr "" " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷.\n" " ³·ÏúÇ©³ö²Ù×÷Âð?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3851,179 +3858,179 @@ msgstr "" "ÔÚ³¢ÊÔ³·ÏúÇ©³öÎļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÁËÒ»¸ö´íÎó.\n" " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷. " -#: Merge.rc:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "ÎÞ" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 ÒÔÇ°°æ±¾)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ¼°ÒÔºó°æ±¾)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "ÒÔ¿Õ°×·Ö¸ô" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÒÔ¿Õ°×»ò±êµã·Ö¸ô" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "½«Ñ¡ÖеÄÏîÄ¿¸´ÖƵ½ÓÒ²àÎļþ¼Ð" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "½«Ñ¡ÖеÄÏîÄ¿¸´ÖƵ½Ö¸¶¨µÄÎļþ¼Ð" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "ɾ³ý×ó²àÑ¡ÖеÄÏîÄ¿" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "ɾ³ýÓÒ²àÑ¡ÖеÄÏîÄ¿" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "ɾ³ýÁ½²àÑ¡ÖеÄÏîÄ¿" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Òþ²ØÑ¡ÖеÄÏîÄ¿(¼´Ê±¹ýÂË)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "ΪÁ½²àÑ¡ÖеÄÏîÄ¿¸ÄÃû" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "ÓҲൽ×ó²à (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "×ó²àµ½ÓÒ²à (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "ÓҲൽ×ó²à (%1 ¹²%2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "×ó²àµ½ÓÒ²à (%1 ¹²%2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "×ó²àµ½... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "ÓҲൽ... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "×ó²àµ½... (%1 ¹²%2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "ÓҲൽ... (%1 ¹²%2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "×ó²à (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "ÓÒ²à (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Á½²à (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "×ó²à (%1 ¹²%2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "ÓÒ²à (%1 ¹²%2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Á½²à (%1 ¹²%2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Ñ¡ÔñÄ¿±êÎļþ¼Ð" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "×ó²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "ÓÒ²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(Ó°Ïì %1 ¸öÎļþ)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(Ó°Ïì %2 ÎļþÖÐµÄ %1 ¸ö)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "ÄúÈ·¶¨Òª¸´ÖÆËùÓв»Í¬µ½×ó²àÎļþÂð£¿" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "ÄúÈ·¶¨Òª¸´ÖÆËùÓв»Í¬µ½ÓÒ²àÎļþÂð£¿" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4039,17 +4046,17 @@ msgstr "" "%2\n" "Âð£¿" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "ÄúÈ·¶¨Òª¸´ÖÆ %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "ÄúÈ·¶¨ÒªÉ¾³ý %1 ÔÚ %2 Ñ¡ÔñµÄÏîÄ¿Âð£¿" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4061,7 +4068,7 @@ msgstr "" "%1\n" "£¿" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4073,17 +4080,17 @@ msgstr "" "%1\n" "Âð£¿" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "ÄúÈ·¶¨Òª¸´ÖÆÂð:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "ÄúÈ·¶¨Òª¸´ÖÆ %d ¸öÏîÄ¿Âð:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4102,458 +4109,458 @@ msgstr "" "\n" "ÇëˢбȽϴ°¿Ú." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "´ò¿ª×ó²àÎļþ" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ª×ó²àÎļþ" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ª×ó²àÎļþ ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "´ò¿ªÓÒ²àÎļþ" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ªÓÒ²àÎļþ" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ªÓÒ²àÎļþ ..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íⲿ±à¼­Æ÷ÔËÐÐʧ°Ü: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "δ֪µÄÍⲿ±à¼­Æ÷À©Õ¹Ãû: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "½«ÎļþÃû¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "½«×ó²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "½«ÓÒ²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "½«Á½²àµÄ·¾¶Ãû¸´ÖƵ½¼ôÌù°å" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "δ֪µÄѹËõ°ü¸ñʽ" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "´Ó×ó²àÌí¼Óµ½Ñ¹Ëõ°ü" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "´ÓÓÒ²àÌí¼Óµ½Ñ¹Ëõ°ü" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "´ÓÁ½²àÌí¼Óµ½Ñ¹Ëõ°ü" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "½«Á½²àÖв»ÏàͬµÄÌí¼Óµ½Ñ¹Ëõ°ü" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "½«×ó²àÑ¡ÖеÄÎļþÒƶ¯µ½Ö¸¶¨Îļþ¼Ð" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "½«ÓÒ²àÑ¡ÖеÄÎļþÒƶ¯µ½Ö¸¶¨Îļþ¼Ð" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "ÎļþÃû³Æ" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Îļþ¼Ð" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "¶Ô±È½á¹û" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "×ó²àÈÕÆÚ" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "ÓÒ²àÈÕÆÚ" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "À©Õ¹Ãû" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "×ó²àÎļþ´óС" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "ÓÒ²àÎļþ´óС" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "ÓÒ²àÎļþ´óС (¼ò¶Ì)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "×ó²àÎļþ´óС (¼ò¶Ì)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "×ó²à½¨Á¢Ê±¼ä" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "ÓҲཨÁ¢Ê±¼ä" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "½ÏеÄÎļþ" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "×ó²àÎļþ°æ±¾" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "ÓÒ²àÎļþ°æ±¾" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "¼ò¶ÌµÄ½á¹û" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "×ó²àÊôÐÔ" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "ÓÒ²àÊôÐÔ" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "×ó²à»»Ðзû" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "ÓҲ໻Ðзû" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "×ó²àÎļþ±àÂë" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "ÓÒ²àÎļþ±àÂë" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "ºöÂԵIJ»Í¬´¦" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "²»Í¬´¦" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "¶þ½øÖÆ" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "ÎÞ·¨¶Ô±ÈÎļþ" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "ÏîÄ¿È¡Ïû" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "ÎļþÒÑÌø¹ý" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Îļþ¼ÐÒÑÌø¹ý" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "½öÔÚ×ó²à: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "½öÔÚÓÒ²à: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "¶þ½øÖÆÎļþÍêÈ«Ïàͬ" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "¶þ½øÖÆÎļþ²»Í¬" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Îļþ²»Í¬" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Ö»´æÔÚ×ó²à" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Ö»´æÔÚÓÒ²à" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "´íÎó" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ö´ÐÐʱ¼ä: %ld ºÁÃë" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "Ñ¡ÔñÁË 1 ¸öÏîÄ¿" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "Ñ¡ÔñÁË %1 ¸öÏîÄ¿" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "ÎļþÃû»òÎļþ¼ÐÃû¡£" -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Ëù´¦µÄ×ÓÎļþ¼ÐÃû¡£" -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "¶Ô±È½á¹û£¬½Ï³¤µÄ¸ñʽ¡£" -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "×ó²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£" -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "ÓÒ²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£" -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "ÎļþµÄÀ©Õ¹Ãû¡£" -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "×ó²àÎļþ³¤¶È×Ö½ÚÊý¡£" -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "ÓÒ²àÎļþ³¤¶È×Ö½ÚÊý¡£" -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "×ó²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "ÓÒ²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "×ó²àµÄ´´½¨Ê±¼ä¡£" -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "ÓÒ²àµÄ´´½¨Ê±¼ä¡£" -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "ÏÔʾ³öÄıßÊǽÏÍíÐ޸ĹýµÄ¡£" -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "×ó²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£" -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "ÓÒ²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£" -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "¶Ì¸ñʽµÄ¶Ô±È½á¹û¡£" -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "×ó²àµÄÊôÐÔ¡£" -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "ÓÒ²àµÄÊôÐÔ¡£" -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "×ó²àÎļþµÄ»»ÐзûÀàÐÍ" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "ÓÒ²àÎļþµÄ»»ÐзûÀàÐÍ" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "×ó²àÎļþµÄ×Ö·û±àÂë¡£" -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "ÓÒ²àÎļþµÄ×Ö·û±àÂë¡£" -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "±»ÂÔ¹ýµÄ²»Í¬Êý. ÓÉWinMergeºöÂԵIJ»Í¬, ÎÞ·¨¶ÔËüÃǽøÐкϲ¢." -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ÎļþÖеIJ»Í¬Êý. ²»°üÀ¨ºöÂԵIJ»Í¬." -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "ÔÚ¶þ½øÖÆÎļþ´¦ÏÔʾÐǺÅ(*)¡£" -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "¶Ô±È %1 ºÍ %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "¶ººÅ·Ö¸ôµÄÁбí" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "ÖƱí·û·Ö¸ôµÄÁбí" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "¼òµ¥HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "¼òµ¥XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "±¨¸æÎļþÒѾ­´æÔÚ£¬Òª¸²¸ÇÂð£¿" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4562,47 +4569,47 @@ msgstr "" "´´½¨±¨¸æʱ³ö´í:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "³É¹¦´´½¨±¨¸æ¡£" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Á½²à´ò¿ªµÄÊÇͬһ¸öÎļþ¡£" -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Ñ¡ÔñµÄÎļþÍêÈ«Ïàͬ¡£" -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Ñ¡ÖеÄÎļþ¼ÐÖ»ÔÚÒ»²à´æÔÚ£¬Òò¶øÎÞ·¨´ò¿ª¡£" -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Ò»¸ö´íÎó·¢ÉúÓÚ¶Ô±ÈÎļþʱ¡£" -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "¶þ½øÖÆÎļþÎÞ·¨×÷ÊÓ¾õµÄ¶Ô±È¡£" -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "ÎÞ·¨´´½¨ÁÙʱÎļþ¡£Çë¼ì²éÄúµÄÁÙʱ·¾¶ÉèÖá£" -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "²»ÄÜÔÚÎļþ¼ÐºÍÎļþÖ®¼ä×ö¶Ô±È¡£" -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4617,7 +4624,7 @@ msgstr "" "\n" "Ìáʾ£ºÈç¹ûÄú×ÜÊǺöÂÔ»»ÐзûµÄ²»Í¬£¬ÇëÔÚ¡°±à¼­/Ñ¡ÏµÄ¡°¶Ô±È¡±Ò³Öй´Ñ¡¡°ºöÂÔ»»Ðзû²î±ð¡±¡£" -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4628,22 +4635,22 @@ msgstr "" "¶ÔÓ¦ÓÚµ±Ç°µÄÑ¡ÏËüÃǽ«Í³Ò»³ÉΪһÖÖ¸ñʽ¡£\n" "ÄúÒª¸Ä±äÑ¡ÏîÉèÖÃÒÔ±£ÁôԭʼµÄ²»Í¬µÄ»»ÐзûÂð£¿" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "ÔÚʹÓòå¼þ¡°%2¡±¶ÔÎļþ¡°%1¡±½øÐÐÔ¤¶Ô±Èʱ·¢ÉúÁËÒ»¸ö´íÎó¡£Ô¤¶Ô±È½«²»»á±»²ÉÓá£" -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Ñ¡ÖеÄÎļþ¼ÐÎÞЧ¡£" -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "ÎÞ·¨Óñ༭Æ÷´ò¿ª¶þ½øÖÆÎļþ¡£" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4654,132 +4661,132 @@ msgstr "" "·Ö±ðÒÔ²»Í¬´úÂëÒ³ÏÔʾ½«»áÓнϺõÄЧ¹û£¬µ«ÊǺϲ¢/¸´ÖÆ»áÓÐΣÏÕ¡£\n" "ÄúÒªÒÔWindowsĬÈϵĴúÂëÒ³ÏÔʾÁ½¸öÎļþÂð(ÍƼö)£¿" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "¾¯¸æ: ÎļþʹÓò»Í¬µÄ×Ö·û±àÂë, ×ó²à=%s ÓÒ²à=%s, ºÏ²¢²Ù×÷ÓпÉÄÜÔì³ÉÐÅÏ¢¶ªÊ§." -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ÓÉÓÚ×Ö·û±àÂë´íÎóÔì³ÉÁ½¸öÎļþÐÅÏ¢¶ªÊ§" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "ÓÉÓÚ×Ö·û±àÂë´íÎóÔì³ÉÓÒ²àÎļþÐÅÏ¢¶ªÊ§" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "ÓÉÓÚ×Ö·û±àÂë´íÎóÔì³É×ó²àÎļþÐÅÏ¢¶ªÊ§" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "ûÓв»Í¬" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "ÐÐÄÚ²»Í¬" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "ÒÑÌæ»» %1 ¸ö×Ö·û´®¡£" -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "ÎÞ·¨²éÕÒ×Ö·û´®¡¸%s¡¹" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "¸´ÖÆÈ«Ãû" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "¸´ÖÆÎļþÃû" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "λÖÃʾÒâ" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "²»Í¬´¦ÏÔʾ" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "³É¹¦Ð´ÈëpatchÎļþ¡£" -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "patchÎļþÒѾ­´æÔÚ£¬ÄúÒª¸²¸ÇËüÂð£¿" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[Ñ¡ÖÐ %1 ¸öÎļþ]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "ÆÕͨ" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "ÉÏÏÂÎÄ" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "ͳһ" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "ÎÞ·¨Ð´ÈëÎļþ %1¡£" -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Ö¸¶¨µÄ·¾¶²»ÊǾø¶Ô·¾¶: %1" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "ÇëÖ¸¶¨Êä³öÎļþ" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "ÎÞ·¨Îª¶þ½øÖÆÎļþ´´½¨ patch¡£" -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "ÎÞ·¨ÎªÎļþ¼Ð´´½¨ patch¡£" -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4790,17 +4797,17 @@ msgstr "" "\n" "´´½¨ patch ÒªÇóÎļþÖÐûÓÐδ±£´æµÄ¸Ä¶¯¡£" -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Îļþ¼Ð²»´æÔÚ¡£" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "µ±Ç°µÄÎļþ¼Ð¶Ô±È½á¹û½«»á±»Çå³ý¡£" -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4812,7 +4819,7 @@ msgstr "" "ûÕÒµ½Ö§³ÖѹËõ°üËùÐèÒªµÄ×é¼þ(7-zip »ò Merge7z*.dll)¡£\n" "Çë²é¿´ÊÖ²á»ñµÃÓйØѹËõ°üÖ§³Ö¼°ÈçºÎÆôÓõĸü¶àÐÅÏ¢¡£" -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4821,7 +4828,7 @@ msgstr "" "\n" "×¢Òâ: 7-Zip ¼¯³É¹¦ÄÜÔÚ WinMerge µÄÉèÖÃÖб»½ûÓÃ." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4830,37 +4837,37 @@ msgstr "" "\n" "×¢Òâ: 7-Zip ¼¯³É¹¦ÄÜÔÚ WinMerge µÄÉèÖÃÖÐÏÞÖÆΪµ¥¶À³ÌÐòʹÓÃ." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Ñ¡Ôñµ¼³öÎļþ" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Ñ¡Ôñµ¼ÈëÎļþ" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Ñ¡ÏîÒÑ´ÓÎļþµ¼Èë." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Ñ¡ÏîÒѾ­µ¼³öµ½Îļþ." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Ñ¡Ïîµ¼Èëʧ°Ü." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Ñ¡Ïîµ¼³öʧ°Ü." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4868,1098 +4875,1098 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "ÕýÔò±í´ïʽ´íÎó" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "²»Æ¥Åä" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "ÎÞЧµÄÕýÔò±í´ïʽ" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "ÎÞЧµÄ collation character" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "ÎÞЧµÄ×Ö·ûÀà(character class)Ãû" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "ĩβµÄ·´Ð±¸Ü" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "ÎÞЧµÄ back reference" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "δÅä¶ÔµÄ [ or [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "δÅä¶ÔµÄ ( or \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "δÅä¶ÔµÄ \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\}µÄÄÚÈÝÎÞЧ" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "ÎÞЧµÄ·¶Î§½áβ" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "ÄÚ´æ²»×ã" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "ÕýÔò±í´ïʽ¹ýÔçµØ½áÊø" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "ÕýÔò±í´ïʽ̫´ó" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "δÅä¶ÔµÄ ) or \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "ÄϷǺÉÀ¼Óï" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "°¢¶û°ÍÄáÑÇÓï" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "°¢À­²®Óï (ɳÌØ°¢À­²®)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "°¢À­²®Óï (ÒÁÀ­¿Ë)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "°¢À­²®Óï (°£¼°)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "°¢À­²®Óï (Àû±ÈÑÇ)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "°¢À­²®Óï (°¢¶û¼°ÀûÑÇ)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "°¢À­²®Óï (ĦÂå¸ç)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "°¢À­²®Óï (Í»Äá˹)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "°¢À­²®Óï (°¢Âü)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "°¢À­²®Óï (Ò²ÃÅ)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "°¢À­²®Óï (ÐðÀûÑÇ)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "°¢À­²®Óï (Ô¼µ©)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "°¢À­²®Óï (Àè°ÍÄÛ)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "°¢À­²®Óï (¿ÆÍþÌØ)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "°¢À­²®Óï (°¢À­²®ÁªºÏÇõ³¤¹ú)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "°¢À­²®Óï (°ÍÁÖ)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "°¢À­²®Óï (¿¨Ëþ¶û)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "ÑÇÃÀÄáÑÇÓï" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "°¢Èû°Ý½®Óï (À­¶¡ÎÄ)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "°¢Èû°Ý½®Óï (Î÷Àï¶ûÎÄ)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "°Í˹¿ËÓï" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "°×¶íÂÞ˹Óï" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "±£¼ÓÀûÑÇÓï" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "¼ÓÌ©ÂÞÄáÑÇÓï" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "ÖÐÎÄ (·±Ìå)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "ÖÐÎÄ (¼òÌå)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "ÖÐÎÄ (Ïã¸Û)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "ÖÐÎÄ (мÓÆÂ)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "ÖÐÎÄ (°ÄÃÅ)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "¿ËÂÞµØÑÇÓï" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "½Ý¿ËÓï" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "µ¤ÂóÓï" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "ºÉÀ¼Óï (ºÉÀ¼)" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "ºÉÀ¼Óï (±ÈÀûʱ)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Ó¢Óï (ÃÀ¹ú)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Ó¢Óï (Ó¢¹ú)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Ó¢Óï (°Ä´óÀûÑÇ)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Ó¢Óï (¼ÓÄôó)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Ó¢Óï (ÐÂÎ÷À¼)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Ó¢Óï (°®¶ûÀ¼)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Ó¢Óï (ÄÏ·Ç)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Ó¢Óï (ÑÀÂò¼Ó)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Ó¢Óï (¼ÓÀձȺ£)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Ó¢Óï (²®Àû×È)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Ó¢Óï (ÌØÁ¢Äá´ï)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Ó¢Óï (½ò°Í²¼Î¤)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Ó¢Óï (·ÆÂɱö)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "°®É³ÄáÑÇÓï" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "·¨ÂÞȺµºÓï" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "²¨Ë¹Óï" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "·ÒÀ¼Óï" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "·¨Óï (·¨¹ú)" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "·¨Óï (±ÈÀûʱ)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "·¨Óï (¼ÓÄôó)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "·¨Óï (ÈðÊ¿)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "·¨Óï (¬ɭ±¤)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "·¨Óï (ĦÄɸç)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "¸ñ³¼ªÑÇÓï" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "µÂÓï (µÂ¹ú)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "µÂÓï (ÈðÊ¿)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "µÂÓï (°ÂµØÀû)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "µÂÓï (¬ɭ±¤)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "µÂÓï (ÁÐÖ§¶ØÊ¿µÇ)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Ï£À°Óï" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Ï£²®À´Óï" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Ó¡µØÓï" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "ÐÙÑÀÀûÓï" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "±ùµºÓï" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Ó¡¶ÈÄáÎ÷ÑÇÓï" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Òâ´óÀûÓï (Òâ´óÀû)" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Òâ´óÀûÓï (ÈðÊ¿)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "ÈÕÓï" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "¿ËʲÃ׶ûÓï (Ó¡¶È)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "¹þÈø¿ËÓï" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "³¯ÏÊÓï" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "³¯ÏÊÓï (JoHab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "À­ÍÑάÑÇÓï" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Á¢ÌÕÍðÓï" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "ÂíÀ´Óï (ÂíÀ´Î÷ÑÇ)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "ÂíÀ´Óï (ÎÄÀ³´ï³ÈøÀ¼)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "ÂüÄáÆÕ¶ûÓï" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "ŲÍþÓï (²©¿ËÂí¶û)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "ŲÍþÓï (Äáŵ˹¿Ë)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "²¨À¼Óï" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "ÆÏÌÑÑÀÓï (ÆÏÌÑÑÀ)" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "ÆÏÌÑÑÀÓï (°ÍÎ÷)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "ÂÞÂíÄáÑÇÓï" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "¶íÓï" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "èóÎÄ" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Èû¶ûάÑÇÓï (À­¶¡Óï)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Èû¶ûάÑÇÓï (ÈûÈðÀû¿Ë)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "ÐŵÂÓï" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "˹Âå·¥¿ËÓï" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "˹ÂåÎÄÄáÑÇÓï" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Î÷°àÑÀÓï (´«Í³·ç¸ñ)" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Î÷°àÑÀÓï (Ä«Î÷¸ç)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Î÷°àÑÀÓï (ÏÖ´ú·ç¸ñ)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Î÷°àÑÀÓï (ΣµØÂíÀ­)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Î÷°àÑÀÓï (¸ç˹´ïÀè¼Ó)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Î÷°àÑÀÓï (°ÍÄÃÂí)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Î÷°àÑÀÓï (¶àÃ×Äá¼Ó¹²ºÍ¹ú)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Î÷°àÑÀÓï (ίÄÚÈðÀ­)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Î÷°àÑÀÓï (¸çÂ×±ÈÑÇ)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Î÷°àÑÀÓï (Ãس)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Î÷°àÑÀÓï (°¢¸ùÍ¢)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Î÷°àÑÀÓï (¶ò¹Ï¶à¶û)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Î÷°àÑÀÓï (ÖÇÀû)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Î÷°àÑÀÓï (ÎÚÀ­¹ç)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Î÷°àÑÀÓï (°ÍÀ­¹ç)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Î÷°àÑÀÓï (²£ÀûάÑÇ)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Î÷°àÑÀÓï (Èø¶ûÍ߶à)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Î÷°àÑÀÓï (ºé¶¼À­Ë¹)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Î÷°àÑÀÓï (Äá¼ÓÀ­¹Ï)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Î÷°àÑÀÓï (²¨¶àÀè¸÷)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "˹ÍßÏ£ÀïÓï (¿ÏÄáÑÇ)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "ÈðµäÓï" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "ÈðµäÓï (·ÒÀ¼)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Ì©Ã׶ûÓï" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "÷²÷°Óï (÷²÷°Ë¹Ì¹¹²ºÍ¹ú)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Ì©Óï" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "ÍÁ¶úÆäÓï" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "ÎÚ¿ËÀ¼Óï" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "ÎÚ¶û¶¼Óï (°Í»ù˹̹)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "ÎÚ¶û¶¼Óï (Ó¡¶È)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "ÎÚ×ȱð¿ËÓï (À­¶¡ÎÄ)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "ÎÚ×ȱð¿ËÓï (Î÷Àï¶ûÎÄ)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Ô½ÄÏÓï" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Î÷Å·" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "¶«Å·" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "¶«ÑÇ" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "ÄÏÑÇ" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Öж«" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "ÆäËü" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "»ìºÏ" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "±£´æ×ó²àµÄÎļþ" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "±£´æÓÒ²àµÄÎļþ" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "½«×ó²àÎļþ±£´æΪָ¶¨ÎļþÃû..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "½«ÓÒ²àÎļþ±£´æΪָ¶¨ÎļþÃû..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "¸Ä±ä×ó²àÎļþ/Îļþ¼ÐµÄÖ»¶ÁÊôÐÔ" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "¸Ä±äÓÒ²àÎļþ/Îļþ¼ÐµÄÖ»¶ÁÊôÐÔ" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "½«»»Ðзûת»»Îª DOS ģʽ" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "½«»»Ðзûת»»Îª UNIX ģʽ" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "½«»»Ðзûת»»Îª MAC ģʽ" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Ôڱ༭ģʽºÍºÏ²¢Ä£Ê½Ö®¼äÇл»" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5968,12 +5975,12 @@ msgstr "" "ÏÔʾ²¢ÐÞ¸ÄÎļþ±àÂëÊôÐÔ\n" "Îļþ±àÂëÊôÐÔ" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5982,7 +5989,7 @@ msgstr "" "Ñ¡Öе±Ç°ÐÐÖв»Í¬µÄ²¿·Ö\n" "µ±Ç°ÐÐÖв»Í¬" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5991,7 +5998,7 @@ msgstr "" "תµ½ÐкŻòij´¦²»Í¬\n" "תµ½ (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6000,7 +6007,7 @@ msgstr "" "É趨³ÌÐòÑ¡Ïî\n" "Ñ¡Ïî" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6009,37 +6016,37 @@ msgstr "" "¸üÐÂÏÔʾ\n" "¸üР(F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "½«µ±Ç°Ñ¡ÖеÄÐи´ÖƵ½¼ôÌù°å²¢ÔÚÿÐÐÇ°Ìí¼ÓÐкÅ" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Ë¢ÐÂÑ¡ÖеÄÏîÄ¿" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "ÉèÖÃ/È¡ÏûÊéÇ©" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "תµ½ÏÂÒ»¸öÊéÇ©" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "תµ½ÉÏÒ»¸öÊéÇ©" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Çå³ýËùÓÐÊéÇ©" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6048,7 +6055,7 @@ msgstr "" "ÏÔʾÍêÈ«ÏàͬµÄÏîÄ¿\n" "ÏÔʾÍêÈ«ÏàͬµÄÏîÄ¿" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6057,7 +6064,7 @@ msgstr "" "ÏÔʾº¬Óв»Í¬µÄÏîÄ¿\n" "ÏÔʾ²»Í¬µÄÏîÄ¿" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6066,7 +6073,7 @@ msgstr "" "ÏÔʾֻÔÚ×ó²à´æÔÚµÄÏîÄ¿\n" "ÏÔʾֻÔÚ×ó²àÏîÄ¿" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6075,7 +6082,7 @@ msgstr "" "ÏÔʾֻÔÚÓÒ²à´æÔÚµÄÏîÄ¿\n" "ÏÔʾֻÔÚÓÒ²àÏîÄ¿" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6084,7 +6091,7 @@ msgstr "" "ÏÔʾ¶þ½øÖÆÎļþ\n" "ÏÔʾ¶þ½øÖÆÎļþ" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6093,7 +6100,7 @@ msgstr "" "ÏÔʾÌø¹ýµÄÎļþ\n" "ÏÔʾÌø¹ýµÄÎļþ" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6102,7 +6109,7 @@ msgstr "" "ΪÊÓͼѡÔñ×ÖÌå\n" "Ñ¡ÔñÊÓͼ×ÖÌå" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6111,27 +6118,27 @@ msgstr "" "°ÑÊÓͼµÄ×ÖÌå»Ö¸´ÎªÏµÍ³×ÖÌå\n" "ĬÈÏ×ÖÌå" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "ÏÔʾ¿Õ°×ºÍÖƱí·û×Ö·û" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "ÏÔʾ/Òþ²Ø¶Ô±È´°¸ñ" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "λÖô°¸ñÏÔʾÎļþµÄ×ÜÌåÇé¿ö" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "ÏÔʾÎļþ¼Ð¶Ô±È½á¹ûͳ¼Æ" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6140,7 +6147,7 @@ msgstr "" "Ñ¡Ôñµ±Ç°Óû§½Ó¿ÚÓïÑÔ\n" "ÓïÑÔ" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6149,12 +6156,12 @@ msgstr "" "ÒÔ²»Í¬µÄÑÕÉ«ÏÔʾÐÐÖеIJ»Í¬\n" "ÏÔʾÐÐÖв»Í¬" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "½»»»×óÓÒ´°¸ñµÄλÖÃ" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6163,7 +6170,7 @@ msgstr "" "ÏÔʾÐкÅ\n" "ÏÔʾÐкÅ" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6172,7 +6179,7 @@ msgstr "" "ÔÊÐí×Ô¶¯»»ÐÐ\n" "×Ô¶¯»»ÐÐ" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6181,17 +6188,17 @@ msgstr "" "ÔÚÁ½¸ö´°¸ñÄÚÏÔʾÓÃÒÔÑ¡ÔñµÄÒ³±ß\n" "ÏÔʾѡÔñÒ³±ß" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6200,7 +6207,7 @@ msgstr "" "¾í¶¯µ½ÉÏÒ»¸ö²»Í¬\n" "ÉÏÒ»¸ö²»Í¬ (Alt + Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6209,7 +6216,7 @@ msgstr "" "¾í¶¯µ½ÏÂÒ»¸ö²»Í¬\n" "ÏÂÒ»¸ö²»Í¬ (Alt + Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6218,7 +6225,7 @@ msgstr "" "¾í¶¯µ½µÚÒ»¸ö²»Í¬\n" "µÚÒ»¸ö²»Í¬ (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6227,7 +6234,7 @@ msgstr "" "¾í¶¯µ½µ±Ç°²»Í¬\n" "µ±Ç°²»Í¬ (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6236,7 +6243,7 @@ msgstr "" "¾í¶¯µ½ÉϴεIJ»Í¬\n" "ÉϴεIJ»Í¬ (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6245,7 +6252,7 @@ msgstr "" "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½ÓÒ²àÎļþ\n" "¸´ÖÆÓÒ²à (Alt + Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6254,7 +6261,7 @@ msgstr "" "¸´ÖÆÑ¡ÔñµÄÎÄ×Öµ½×ó²àÎļþ\n" "¸´ÖÆ×ó²à (Alt + Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6263,7 +6270,7 @@ msgstr "" "½«µ±Ç°²»Í¬´¦¸´ÖƵ½ÓҲಢǰ½øµ½ÏÂÒ»´¦²»Í¬\n" "¸´ÖƵ½ÓҲಢǰ½ø (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6272,7 +6279,7 @@ msgstr "" "½«µ±Ç°²»Í¬´¦¸´ÖƵ½×ó²à²¢Ç°½øµ½ÏÂÒ»´¦²»Í¬\n" "¸´ÖƵ½×ó²à²¢Ç°½ø (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6281,7 +6288,7 @@ msgstr "" "¸´ÖÆËùÓв»Í¬µ½ÓÒ²àÎļþ\n" "ËùÓе½ÓÒ²à" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6290,72 +6297,72 @@ msgstr "" "¸´ÖÆËùÓв»Í¬µ½×ó²àÎļþ\n" "ËùÓе½×ó²à" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "ɾ³ýÁ½²àÖÐÑ¡ÖеÄÏîÄ¿" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "¶Ô±ÈÑ¡ÖеÄÏîÄ¿(µ±¶àѡʱ¶Ô±ÈµÚÒ»¸öÏîÄ¿)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Ñ¡Ôñ¼°ÅÅÐòÎļþ¼Ð¶Ô±ÈÏÔʾµÄÁÐ" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Éú³ÉÒ»¸öpatchÎļþ" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Ñ¡Ôñ¼°Ð޸ĹýÂËÆ÷" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "ÓɶԱȽá¹ûÉú³É±¨¸æ" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "ÈÃÓû§Ñ¡Ôñ½â°ü³ÌÐò (¶Ô±ÈÎļþ¼Ðʱ²»½øÐнâ°ü)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "ÔÚÁ½¸öÎļþÉÏÓ¦ÓÃÊʵ±µÄ½â°ü³ÌÐò (ÎļþÖ»ÐèÒªÓÐÊʵ±µÄÀ©Õ¹Ãû)" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Ñ¡ÔñÒ»¸ö½â°ü³ÌÐòÀ´±à¼­Õâ¸öÎļþ" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "ûÓÐÔ¤¶Ô±È³ÌÐò (ÆÕͨ)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "ÍƼöµÄ²å¼þ" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "ÆäËü²å¼þ" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "жÔØËùÓвå¼þ²¢ÖØÐÂÔØÈë (¿ª·¢ÕßÓÃ)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6364,12 +6371,12 @@ msgstr "" "Çл»µ½ÏÂÒ»¸ö¿É¼ûµÄÎļþ´°¸ñ\n" "Çл»µ½Ï¸öÎļþ" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "¹Ø±ÕËùÓдò¿ªµÄ´°¿Ú" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6378,22 +6385,22 @@ msgstr "" "ÏÔʾ WinMerge Óû§°ïÖú\n" "°ïÖú" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "½«µ±Ç°µÄ WinMerge °æ±¾ÐÅÏ¢¼°ÅäÖÃÊä³öµ½Îı¾Îļþ" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "ÏÔʾ GNU ¹«¹²ÊÚȨ" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6402,7 +6409,7 @@ msgstr "" "´ò¿ª WinMerge °ïÖúË÷Òý\n" "°ïÖúË÷Òý" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6411,267 +6418,272 @@ msgstr "" "´ò¿ª WinMerge °ïÖúËÑË÷\n" "°ïÖúËÑË÷" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "²å¼þÉèÖÃ" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "ûÓÐÔ¤¶Ô±È³ÌÐò" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Èç¹û¿ÉÄÜ£¬½øÐÐÔ¤¶Ô±È" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH δÕÒµ½ - .sct ½Å±¾ÒѽûÓÃ" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "<ÎÞ>" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "<×Ô¶¯>" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "ÓÃϵͳĬÈϳÌÐò´ò¿ªÎļþ" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ªÎļþ" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Ñ¡Ôñ³ÌÐòÒÔ´ò¿ªÎļþ" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "²»ÏÔʾÒƶ¯Çø¿é" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "ÏÔʾËùÓÐÒƶ¯Çø¿é" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Ö»ÏÔʾµ±Ç°´¦µÄÒƶ¯Çø¿é" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "תµ½¹â±ê´¦²»Í¬" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "תµ½µÚ %1 ´¦²»Í¬(¹² %2 ´¦)(&O)" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "תµ½µÚ %1 ÐÐ(&O)" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "½ûÓÃ" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "ÓÉÎļþϵͳѡÔñ" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "ÓÉ×î½üʹÓõÄÎļþÑ¡Ôñ" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Òþ²Ø¹¤¾ßÀ¸" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "ÏÔʾС¹¤¾ßÀ¸" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "ÏÔʾ´ó¹¤¾ßÀ¸" diff --git a/Src/Languages/ChineseTraditional.po b/Src/Languages/ChineseTraditional.po index d3595b826..e3b26e7f8 100644 --- a/Src/Languages/ChineseTraditional.po +++ b/Src/Languages/ChineseTraditional.po @@ -71,7 +71,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "½Æ»s(&C)" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "¶K¤W(&P)" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "¸õ¦Ü(&G)..." @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "¶}±Ò(&E)" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "¥Îµn¿ýªºÀ³¥Îµ{¦¡(&R)" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "¥Î¥~¦b½s¿è¾¹(&E)" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "¥Î(&W)..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "ÀÉ®×(&F)" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "·s¼W(&N)\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "¶}±Ò(&O)...\tCtrl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "¶}±Ò±M®×...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Àx¦s±M®×(&V)..." @@ -158,1846 +158,1853 @@ msgid "Recent Projects" msgstr "³Ìªñ¶}±Òªº±M®×" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "µ²§ô(&X)" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "½s¿è(&E)" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "¿ï¶µ(&O)..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "À˵ø(&V)" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "¿ï¨ú¦r«¬(&F)..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "¨Ï¥Î¹w³]¦r«¬(&O)" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "¤u¨ã¦C(&T)" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "Ãö³¬(&N)" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "¤p¹Ï¥Ü(&S)" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "¤j¹Ï¥Ü(&B)" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "ª¬ºA¦C(&S)" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "­¶ÅÒ¦C(&B)" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "»y¨¥(&L)..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "¤u¨ã(&T)" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "¿z¿ï¤è¦¡(&F)..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "²£¥Í¸Éºó(&G)..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "¥~±¾(&P)" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "¤â°Ê¸Ñ¶}«D¯Â¤å¦rÀÉ(&M)" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "¦Û°Ê¸Ñ¶}«D¯Â¤å¦rÀÉ(&A)" # Is this message correct? Because the unpacker here is not a editor. #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "¥H¸Ñ¥]¾¹½s¿è(&E)" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "­«·s¸ü¤J¥~±¾(&R)" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "°£¿ù(&D)" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "¸ü¤J²ÕºA(&L)..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "«ì´_­ì©l³]©w(&R)" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "µøµ¡(&W)" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "Ãö³¬(&O)" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Ãö³¬¥þ³¡(&S)" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "¤Á´«µ¡®æ(&P)\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "¤ô¥­¨Ã±Æ(&H)" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "««ª½¨Ã±Æ(&V)" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "Å|¸m(&C)" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "»¡©ú(&H)" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "¤º®e(&C)...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "¯Á¤Þ(&I)..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "·j´M(&S)..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "²ÕºA(&O)..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Ãö³¬À£ÁY¤ä´©(&R)..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "GNU ¤½¦@±ÂÅvÃÒ(&G)..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "Ãö©ó WinMerge(&A)..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "¶}±Ò±M®×(&J)...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "¥ªÃä°ßŪ(&E)" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "¥kÃä°ßŪ(&G)" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "ÀÉ®×½s½X(&C)" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "¥þ¿ï(&A)\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Åã¥Ü¬Û¦P¶µ¥Ø(&I)" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Åã¥Ü¬Û²§¶µ¥Ø(&D)" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Åã¥Ü¥ªÃä¿W¦³¶µ¥Ø(&E)" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Åã¥Ü¥kÃä¿W¦³¶µ¥Ø(&G)" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Åã¥Ü²¤¹Lªº¶µ¥Ø(&K)" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Åã¥Ü¤G¶i¨îÀÉ®×(&H)" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Åã¥ÜÁôÂöµ¥Ø(&E)" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "²Î­p¤ñ¸ûµ²ªG(&R)" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "­«¾ã(&S)\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "­«¾ã¼Ð¥Ü°Ï(&R)\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "¦X¨Ö(&M)" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "¤ñ¸û(&M)\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "¤U¤@¬Û²§(&N)\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "¤W¤@¬Û²§(&P)\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "³Ìªì¬Û²§(&F)\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "¥Ø«e¬Û²§(&C)\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "³Ì¥½¬Û²§(&L)\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "½Æ»s¨ì¥kÃä(&R)\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "½Æ»s¨ì¥ªÃä(&E)\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "§R°£(&D)\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "¦Û­qÄæ¦ì(&C)..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "²£¥Í³ø§i(&R)..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "Àx¦s(&S)\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Àx¦s¥ªÃä(&L)" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "Àx¦s(&S)" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "¥t¦s·sÀÉ(&A)..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Àx¦s¥kÃä(&R)" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "¦C¦L(&P)..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "³]©w¦C¦L®æ¦¡(&T)" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "¹wÄý¦C¦L(&R)" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "Âà´«¦æ§À¦r¤¸¦¨(&C)" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "CRLF (DOS)(&D)" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "LF (UNIX)(&U)" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "CR (MAC)(&M)" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "¶}/Ãö¦X¨Ö¼Ò¦¡(&M)\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "´_­ì(&U)\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "¦A°µ(&R)\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "°Å¤U(&U)\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "½Æ»s(&C)\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "¶K¤W(&P)\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "¿ï¨ú¦æ¤º®t²§(&D)\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "´M§ä(&I)...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "¨ú¥N(&C)...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "ÀHĶ§Y¦æ½X(&S)" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< µL >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "¶i¶¥" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "³s¦P¦æ¸¹½Æ»s(&C)\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "®ÑÅÒ(&B)" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "©ñ¸m/²M°£®ÑÅÒ(&T)\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "¤U¤@®ÑÅÒ(&N)\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "¤W¤@®ÑÅÒ(&P)\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "²M°£¥þ³¡®ÑÅÒ(&C)" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "²¾¦Ü(&G)...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "»yªk°ª«G«×Åã¥Ü" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "Âê¦íµ¡®æ(&L)" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "À˵øªÅ¥Õ©M¸õ®æ(&V)" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "À˵ø¦æ¤º®t²§(&W)" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "À˵ø¦æ¸¹(&N)" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "À˵ø­¶Ãä(&M)" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "¦Û°Ê´«¦æ(&R)" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "µ¡®æ´«¦ì(&A)" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "®t²§µ¡®æ(&P)" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "¦ì¸mµ¡®æ(&P)" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "½Æ»s¨ì¥kÃä«á¨ì¤U¤@­Ó(&O)\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "½Æ»s¨ì¥ªÃä«á¨ì¤U¤@­Ó(&T)\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "¥þ³¡½Æ»s¨ì¥kÃä(&A)" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "¥þ³¡½Æ»s¨ì¥ªÃä(&Y)" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "¥ý¦æ³B²z¾¹(&P)" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "¤ñ¸û(&A)" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "¥ªÃä¨ì¥kÃä(&L)" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "¥ªÃä¨ì(&E)..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "¥kÃä¨ì¥ªÃä(&R)" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "¥kÃä¨ì(&I)..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "²¾°Ê(&M)" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "¥ªÃä¨ì(&L)..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "¥kÃä¨ì(&R)..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "§R°£(&D)" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "¥ªÃä(&L)" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "¥kÃä(&R)" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "¨âÃä(&B)" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "­«·s©R¦W(&N)" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "ÁôÂÃÀÉ®×(&H)" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "¶}±Ò¥ªÃä(&O)" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "¶}±Ò¥kÃä(&P)" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "½Æ»s®|¦W(&Y)" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "¥ªÃä(&L) (%2 ¤§ %1)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "¥kÃä(&R) (%2 ¤§ %1)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "¨âÃä(&B) (%2 ¤§ %1)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "½Æ»sÀɦW(&F)" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "Zip(&Z)" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "¥ªÃä(&L)... (%2 ¤§ %1)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "¥kÃä(&R)... (%2 ¤§ %1)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "¨âÃä(&B)... (%2 ¤§ %1)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "¬Û²§ªÌ(&D)... (%2 ¤§ %1)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "­«¾ã(&R)" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "½Æ»s§¹¾ã¸ô®|(&C)" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "½Æ»sÀɦW(&F)" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "¥ý¦æ³B²z¾¹³]©w" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "¤£­n¥ý¦æ³B²z¾¹(&N)" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "¦Û°Ê¥ý¦æ³B²z¾¹" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "¦Ü¬Û²§°Ï¶ô(&O)" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "¤£Åã¥Ü²¾¦ì°Ï¶ô(&N)" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "Åã¥Ü²¾¦ì°Ï¶ô(&A)" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "´N¥Ø«e¬Û²§³BÅã¥Ü¨ä²¾¦ì°Ï¶ô(&C)" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Ãö©ó WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(¨p¤H½sĶ)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "ª©Åv©Ò¦³" -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "«ô³X WinMerge ­º­¶¡I" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "½T©w" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "°^ÄmªÌ" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "¿ï¨úÀɮשθê®Æ§¨" -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "¥ªÃä(&L)¡G" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "ÂsÄý(&B)..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "¥kÃä(&R)¡G" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "ÂsÄý(&W)..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "¿z¿ï¤è¦¡(&F)¡G" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "¿ï¨ú..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "¸Ñ¥]¾¹(&U)¡G" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "¿ï¨ú(&S)..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "¥]¬A¤l¸ê®Æ§¨(&I)" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "ª¬ºA¡G" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "¨ú®ø" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "»¡©ú" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "­n¤ñ¹ïªºÀɮשθê®Æ§¨" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "¸ê®Æ®w¡G" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "±M®×¡G" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "¥Î¤á¡G" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "±K½X¡G" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "³sµ²¨ì¥Ø¼Ð VSS ±M®×" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "®M¥Î¨ì©Ò¦³¶µ¥Ø" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "³q¹L" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "¥t¦s·sÀÉ..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "ª©¥»ºÞ²z¨t²Î" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "ª©¥»ºÞ²z¨t²Î(&V)¡G" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe ¸ô®|(&P)¡G" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "¤@¯ë" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "¦Û°Ê±²¦Ü³Ìªì®t²§(&S)" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "±Ò°Ê®É¤£­n¹ÏÀ²(&D)" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "«ö ESC Ãö³¬µøµ¡(&O)" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "©ó¡u¶}±Ò¡v¹ï¸Ü¤è¶ô¦Û°ÊÀËÅç¸ô®|(&A)" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "¤£¯à¦P®É°õ¦æ¤@­Ó¥H¤W¥»µ{¦¡(&O)" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "Ãö³¬¦h­«µøµ¡®É¥ý¸ß°Ý(&K)" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "¡u¶}±Ò¡v¹ï¸Ü¤è¶ô¤§¦Û°Ê§¹¦¨(&P)¡G" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "±Ò¥Î¦h­«¤ñ¸ûµøµ¡" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "¤ñ¸û¸ê®Æ§¨®É(&F)" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "¤ñ¸ûÀÉ®×®É(&E)" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "­«³]" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "»y¨¥" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "¥i¥Îªº»y¨¥¡G" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "´M§ä" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "´M§ä(&N)¡G" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "¿W¥ß§¹¾ã¦r(&W)" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "°Ï¤À¤j¤p¼g(&C)" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "¥ÎÃþ«¬ªí¦¡(&E)" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "¦ÜÀɧÀ¤£§éªð(&O)" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "¤è¦V" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "¤W²¾(&U)" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "¤U²¾(&D)" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "§ä¤U¤@­Ó(&F)" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "¨ú¥N" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "¥N¥H(&P)¡G" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "¦ÜÀɧÀ¤£§éªð(&D)" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "©ó" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "¿ï¨ú°Ï(&S)" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "¾ã­ÓÀÉ®×(&O)" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "¨ú¥N(&R)" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "¥þ³¡¨ú¥N(&A)" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "°e¦^§ï¹LÀÉ" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "³Æµù" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "°e¦^§ï¹LÀÉ«á´N¨ú¥X¤§" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "¦æ¤§¿z¿ï¤è¦¡" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "±Ò¥Î¦æ¿z¿ï¤è¦¡" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ãþ«¬ªí¦¡ (¨C¦æ¤@¦¡)¡G" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Àx¦s" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "·s¼W" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "½s¿è" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "²¾°£" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "¦â±m" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "¬Û²§°Ï¶ô¡G" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "¤w¿ï¨úªº¬Û²§°Ï¶ô¡G" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "­I´º" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "¤w§R°£" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "«e´º¤å" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "©¿²¤ªº¬Û²§°Ï¶ô¡G" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "²¾¦ì°Ï¶ô¡G" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "¤w¿ï¨úªº²¾¦ì°Ï¶ô¡G" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "¦r¼h¦¸ªº¬Û²§¡G" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "¤w¿ï¨úªº¦r¬Û²§¡G" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "¹w³]­È" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "¹ï¸Ü" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "¨t²Î" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "§R°£ÀÉ°e¨ì¸ê·½¦^¦¬µ©(&S)" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "¦p¨âÀɮפ§­×§ï®É¶¡¶¡¹j¤Ö©ó¤T¬í¡A«h©¿²¤¦¹®t²§(&O)" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "¾ã¦X" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "¥[¨ìÀÉ®×Á`ºÞ¥kÁä¿ï³æ(&A)" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "±Ò¥Î¶i¶¥¿ï³æ(&N)" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "¦Û°Ê¥]¬A¤l¥Ø¿ý(&C)" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "¥~³¡½s¿è¾¹(&E)¡G" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "¸ê®Æ§¨¿z¿ï¤è¦¡(&F)¡G" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "ÂsÄý..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "¸Éºó²£¥Í¾¹" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "ÀÉ®×1(&1)¡G" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "ÀÉ®×2(&2)¡G" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "ÂsÄý(&O)..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "¹ï½Õ(&S)" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "ªþ¥[¨ì²{¦³ÀÉ®×(&A)" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "µ²ªG(&R)¡G" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "®æ¦¡(&F)" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "¼Ë¦¡(&Y)¡G" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "¤W¤U¤å(&C)¡G" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "ªÅ®æ(&H)" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "¤ñ¸û¤§(&P)" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "©¿²¤¨äÅܧó(&G)" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "©¿²¤¥þ³¡(&N)" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "©¿²¤ªÅ¥Õ¦æ(&E)" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "°Ï¤À¤j¤p¼g(&T)" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "ªþ¥[ diff ©R¥O©óÀÉ­º(&P)" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "¶}±Ò¥~³¡½s¿è¾¹(&X)" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Åã¥ÜÄæ¦ì" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "¤W²¾(&U)" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "¤U²¾(&D)" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "¿ï¨ú¸Ñ¥]¾¹" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Àɮ׸ѥ]¾¹¡G" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Åã¥Ü©Ò¦³¸Ñ¥]¾¹¡A¤£­nÀˬd°ÆÀɦW" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "°ÆÀɦW²M³æ¡G" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "´y­z¡G" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "¤ñ¸û¸ê®Æ§¨¤¤" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "°±¤î" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "¤ñ¸û¶µ¥Ø¤¤..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "¤ñ¸û¹Lªº¶µ¥Ø¡G" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "¶µ¥ØÁ`¼Æ¡G" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "²¾¦Ü" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "²¾¦Ü(&O)¡G" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "ÀÉ®×" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "²¾¦Ü" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "¦æ(&N)" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "¬Û²§°Ï¶ô(&D)" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "²¾¦Ü(&G)" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "¤ñ¸û" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "ªÅ¥Õ³B" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "¤ñ¹ïªÅ¥Õ³B(&W)" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "©¿²¤ªÅ¥Õ¼Æ¶q¤§Åܰʦӳy¦¨ªº®t²§(&H)" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "©¿²¤ªÅ¥Õ³B¤§¥ô¦ó®t²§(&A)" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "©¿²¤ªÅ¥Õ¦æ(&K)" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "©¿²¤¤j¤p¼g(&C)" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "©¿²¤´«¦æ¦r¤¸¤§®t²§(DOS/UNIX/MAC)(&R)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "°»´ú²¾¦ìªº°Ï¶ô(&N)" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "§ä¥X¬Û¦ü¦æ(&M)" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Àɮפñ¸û¤è¦¡(&F)¡G" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "²Ä¤@­Ó®t²§´N°±(&T)" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "¿z¿ï¤è¦¡¤§µù" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "½s¿è¾¹" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "°ª«G«×»yªk(&H)" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "¦Û°Ê­«·s±½´y(&A)" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "«O¯d­ì©l EOL ¦r¤¸(&P)" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "¸õ®æ" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "¸õ®æ¤j¤p(&T)¡G" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "´¡¤J¸õ®æ¦r¤¸(&I)" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "´¡¤JªÅ¥Õ(&S)" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "¦æ¤º®t²§µÛ¦â" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "À˵ø¦æ¤º®t²§" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "¦r¤¸¶¥¼h(&C)" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "¦r¶¥¼h(&W)¡G" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Àɮ׿z¿ï¤è¦¡" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "´ú¸Õ" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "¦w¸Ë..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "·s¼W..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "½s¿è..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "§R°£..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Àx¦s­×§ïªºÀɮסH" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "¥ªÃäÀÉ®×" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "Àx¦sÅܧó(&S)" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "©ñ±óÅܧó(&D)" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "¥kÃäÀÉ®×" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "Àx¦sÅܧó(&A)" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "©ñ±óÅܧó(&C)" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "©ñ±ó¥þ³¡" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "½s½X­¶" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "½s½X­¶" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "©ó¸ü¤J non-unicode Àɮ׮ɧïÅܩҥΪº½s½X­¶¦¨" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2006,32 +2013,32 @@ msgstr "" "°»´ú¤Î¨Ï¥Î html, rc ¤Î xml Àɮתº½s½X­¶¸ê°T¡C\n" "»Ý­n­«·s¸ü¤JÀɮסC" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "¨t²Î¥Îªº½s½X­¶" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "WinMerge ¨Ï¥ÎªÌ¤¶­±¥Îªº½s½X­¶" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "¦Û­q½s½X­¶¡G" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - ¤wÃö³¬À£ÁYÀɤ䴩" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "¤£¯à°»´ú 7-Zip ª©¥»(¨S¦w¸Ë¥¦¡H)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2040,24 +2047,24 @@ msgstr "" "¥²¶·¦w¸Ë 7-Zip 3.11 ©Î§ó±ßªºª©¥»©ó§Aªº¹q¸£¡A\n" "©Î¨ä®Ö¤ß¤¸¥ó¤w³Q½Æ»s¨ìµ{¦¡¥Ø¿ý¡F" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "ÁÙ¥²¶·¦b¸ô¸g¤W¦³¾A·í¤¶­±¥~±¾(Merge7z*.dll)¡A¤~¯à¤ä´©À£ÁY¡C" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "°£«D¦³§ó·sª©¥i¥Î¡A«Øij¨Ï¥Î¤U­±ªº 7-Zip ¤¶­±¥~±¾ª©¥»¡C" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "ª©¥»" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2066,54 +2073,54 @@ msgstr "" "©Ò­nªº¥~±¾\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "±ÀÂ˪º 7-Zip ª©¥»¡G" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "¦s¦b" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "¤w¦w¸Ë©ó§Aªº¹q¸£ªº¿W¥ß 7-Zip ³nÅé¡G" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "µL" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "¤£¦s¦b" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "¥i¿W¥ß¹B§@ªº 7-Zip ¤¸¥ó¡G" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "¤wÂÂ" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "¥~±¾©Ò¦b¸ô®|¡G" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2122,486 +2129,486 @@ msgstr "" "¤Å¦AÅã¥Ü¦¹°T®§¡C(&M)\n" "(¤´¥i¥Ñ»¡©ú¿ï³æ¤¤¥s¥X¥¦)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "¥~±¾¤U¸ü" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "¿ï¶µ" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr "ºØÃþ" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "¶×¤J..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "¶×¥X..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "ÃöÁä¦r¡G" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "¨ç¼Æ¦W¡G" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "µù¡G" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "¼Æ¡G" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "¹Bºâ¤l¡G" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "¦r¦ê¡G" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "«e³B²z¾¹¡G" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "¨Ï¥ÎªÌ 1¡G" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "¨Ï¥ÎªÌ 2¡G" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "²ÊÅé" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "¤ñ¸û¥Ø¿ý«áªº³ø§i" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "³ø§iÀÉ(&F)¡G" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "¼Ë¦¡(&S)¡G" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "½Æ»s¨ì°Å¶Kï(&C)" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "¦@¥Î©Î­Ó¤H¿z¿ï¤è¦¡" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "§A­n«Ø¥ß­þºØ¿z¿ï¤è¦¡¡H" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "¦@¥Î¿z¿ï¤è¦¡(¾A¥Î©Ò¦³¨Ï¥ÎªÌ)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "­Ó¤H¿z¿ï¤è¦¡(¶È¾A¥Î²{¦b¨Ï¥ÎªÌ)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "¤ä´©À£ÁY" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "¥²¶·¥ý¦w¸Ë 7-Zip ¥~±¾¡A¤~¤ä´©À£ÁY¡G" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "¤U¸ü 7-zip ¥~±¾" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "À£ÁYÀɤ䴩(&E)" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "­Y¦³¿W¥ß©ó WinMerge ªº 7-Zip¡A«h¥Î¤§(&U)" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "¨Ï¥Î¤£¿W¥ß©ó WinMerge ªº 7-Zip(&S)" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "°»´úÀÉ­º¸ê°T¥H¨M©wÀ£ÁYÀÉÃþ«¬(&D)" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "¤ñ¸û«áªº²Î­p" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "¸ê®Æ§¨¡G" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "ÀɮסG" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "¤£¦P" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "¤å¦r¡G" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "¤G¶i¨î¡G" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "¿W¦³" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "¥ªÃä¡G" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "¥kÃä¡G" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "¥þ¦P" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Á`­p¡G" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Ãö³¬" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "¼vÅT" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(¼vÅT)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "¿ï©w½s½X­¶µ¹" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "­n¸ü¤JªºÀÉ®×(&F)¡G" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "­nÀx¦sªºÀÉ®×(&S)¡G" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "¨âÀɳ£¥Î¬Û¦Pªº½s½X­¶(&U)" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "®M¥Î(&A)" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "¨ú®ø(&C)" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "´ú¸Õ¿z¿ï¤è¦¡" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "´ú¸Õ¿z¿ï¾¹ ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "¿é¤J¤å¦r¥H°µ´ú¸Õ(&E)¡G" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "¸ê®Æ§¨¦WºÙ(&F)" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "µ²ªG¡G" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "´ú¸Õ(&T)" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "Ãö³¬(&C)" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "¨Ï¥Î¦Û­q¤å¦r¦â±m(&U)" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "¦Û­q¤å¦r¦â±m" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "ªÅ¥Õ¡G" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Ãþ«¬ªí¦¡¤å¡G" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "¿ï¨ú¡G" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "¸ô®|" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "°ßŪ(&E)" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "°ßŪ(&A)" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "¶}±Ò..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Àx¦s..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "³Æ¥÷ÀÉ®×" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "²£¥Í³Æ¥÷ÀÉ©ó¡G" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "²£¥Í³Æ¥÷ÀɦܡG" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "­ì©lÀɪº¸ê®Æ§¨(&O)" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "Á`ªº³Æ¥÷¸ê®Æ§¨(&G)¡G" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "³Æ¥÷ÀÉÀɦW¡G" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "ªþ¤W .bak °ÆÀɦW(&A)" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "ªþ¤W®É¶¡ÂW°O(&P)" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "½T»{½Æ»s" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "½T©w­n½Æ»s XXX ¶µ¥Ø¡H" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "±q¥ªÃä" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "¨ì¥kÃä" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "¬O" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "§_" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "040403B6" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "2.2¥Ñ koko ½Ķ¡C2.7.4¥ÑÅǺû¥¿­×¥¿¡B½Ķ" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x404, 950" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "´Nºü" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2610,7 +2617,7 @@ msgstr "" "«Ø¥ßªÅ¥Õ¤å¥ó\n" "·s¤å¥ó (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2619,7 +2626,7 @@ msgstr "" "¶}±Ò²{¦s¤å¥ó\n" "¶}±Ò (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2628,7 +2635,7 @@ msgstr "" "Ãö³¬¥Ø«e½s¿è¤å¥ó\n" "Ãö³¬" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2637,7 +2644,7 @@ msgstr "" "Àx¦s¥Ø«e½s¿è¤å¥ó\n" "Àx¦s (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2646,7 +2653,7 @@ msgstr "" "¥H·s¦WºÙÀx¦s¥Ø«e½s¿è¤å¥ó\n" "¥t¦s·sÀÉ" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2655,7 +2662,7 @@ msgstr "" "Åܧó¦C¦L¿ï¶µ\n" "ª©­±³]©w" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2664,7 +2671,7 @@ msgstr "" "Åܧó¦Lªí¾÷©M¦C¦L¿ï¶µ\n" "¦C¦L³]©w" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2673,7 +2680,7 @@ msgstr "" "¦C¦L¥Ø«e½s¿è¤å¥ó\n" "¦C¦L" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2682,12 +2689,12 @@ msgstr "" "Åã¥Ü¾ã­¶\n" "¹wÄý¦C¦L" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "¨Ï©Ò¦³ÁôÂöµ¥Ø¦AÅã¥Ü¥X¨Ó" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2696,32 +2703,32 @@ msgstr "" "¶}±Ò±M®×ÀÉ\n" "±M®×ÀÉ (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "¶}±Ò±M®×Àɮɵo¥Í¤£©ú¿ù»~" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Àx¦s±M®×Àɮɵo¥Í¤£©ú¿ù»~" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "±M®×ÀÉ" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "±M®×Àɦ¨¥\¸ü¤J¡C" -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "±M®×Àɦ¨¥\Àx¦s¡C" -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2730,7 +2737,7 @@ msgstr "" "Àx¦s¥Ø«e¸ô®|¤Î¿ï¶µ¦Ü±M®×ÀÉ\n" "Àx¦s±M®×ÀÉ" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2739,7 +2746,7 @@ msgstr "" "Åã¥Üµ{¦¡¸ê°T¡Aª©¥»¸¹½X©Mª©Åv\n" "Ãö©ó" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2748,9 +2755,6 @@ msgstr "" "Â÷¶}À³¥Îµ{¦¡¡F´£¿ôÀx¦s¤å¥ó\n" "µ²§ô" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2764,11 +2768,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "¶}±Ò¦¹¤å¥ó" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2777,7 +2784,7 @@ msgstr "" "¤Á´«¨ì¤U¤@µøµ¡\n" "¤U¤@µøµ¡" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2786,7 +2793,7 @@ msgstr "" "¤Á´«¦^¤W¤@µøµ¡\n" "¤W¤@µøµ¡" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2795,7 +2802,7 @@ msgstr "" "¬°¥Ø«e½s¿è¤å¥ó¶}±Ò¥t¤@­Óµøµ¡\n" "·sµøµ¡" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2804,7 +2811,7 @@ msgstr "" "¦bµøµ¡©³³¡±Æ¦C¹Ï¥Ü\n" "±Æ¦C¹Ï¥Ü" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2813,7 +2820,7 @@ msgstr "" "Å|¸mµøµ¡\n" "Å|¸mµøµ¡" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2822,7 +2829,7 @@ msgstr "" "«DÅ|¸m¤W¤U±Æ¦Cµøµ¡\n" "¤W¤U¨Ã¦Cµøµ¡" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2831,7 +2838,7 @@ msgstr "" "«DÅ|¸m¥ª¥k±Æ¦Cµøµ¡\n" "¥ª¥k¨Ã¦Cµøµ¡" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2840,7 +2847,7 @@ msgstr "" "¤À³Î¥Ø«e½s¿èµøµ¡\n" "¤À³Î" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2849,7 +2856,7 @@ msgstr "" "§R°£©Ò¿ï\n" "§R°£" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2858,7 +2865,7 @@ msgstr "" "¥þ³¡§R°£\n" "¥þ³¡§R°£" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2867,7 +2874,7 @@ msgstr "" "½Æ»s©Ò¿ï¨ì°Å¶Kï\n" "½Æ»s" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2876,7 +2883,7 @@ msgstr "" "°Å¤U©Ò¿ï¨ì°Å¶Kï\n" "°Å¤U" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2885,7 +2892,7 @@ msgstr "" "´M§ä«ü©w¤å¦r\n" "´M§ä" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2894,7 +2901,7 @@ msgstr "" "´¡¤J°Å¶K鷺®e\n" "¶K¤W" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2903,7 +2910,7 @@ msgstr "" "­«½Æ¤W¦¸ªº°Ê§@\n" "­«½Æ" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2912,7 +2919,7 @@ msgstr "" "¥H¤£¦P¤å¦r¨ú¥N«ü©w¤å¦r\n" "¨ú¥N" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2921,7 +2928,7 @@ msgstr "" "¿ï¨ú¾ã¥÷¤å¥ó\n" "¥þ¿ï" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2930,7 +2937,7 @@ msgstr "" "ºM¦^¤W¦¸°Ê§@\n" "´_­ì" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2939,7 +2946,7 @@ msgstr "" "­«°µ¤W¦¸ºM¦^ªº°Ê§@\n" "­«°µ" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2948,7 +2955,7 @@ msgstr "" "Åã¥Ü©ÎÁôÂäu¨ã¦C\n" "±Ò³¬¤u¨ã¦C" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2957,7 +2964,7 @@ msgstr "" "Åã¥Ü©ÎÁôÂꬺA¦C\n" "±Ò³¬ª¬ºA¦C" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2966,7 +2973,7 @@ msgstr "" "Åã¥Ü©ÎÁôÂí¶ÅÒ¦C\n" "±Ò³¬­¶ÅÒ¦C" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "" "Automatically resize panes\n" @@ -2975,57 +2982,57 @@ msgstr "" "¦Û°Ê½Õ¾ãµ¡®æ¤j¤p\n" "Âê¦íµ¡®æ" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "§ó§ïµøµ¡¤j¤p" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "§ó§ïµøµ¡¦ì¸m" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "ÁY¤pµøµ¡¦¨¹Ï¥Ü" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "ÂX¤jµøµ¡¦¨¥þ¿Ã¹õ" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "¤Á´«¨ì¤U¤@¤å¥óµøµ¡" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "¤Á´«¨ì¤W¤@¤å¥óµøµ¡" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Ãö³¬¥Ø«e½s¿èµøµ¡¨Ã´£¿ôÀx¦s¤å¥ó" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "µøµ¡«ì´_¼Ð·Ç¤j¤p" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "±Ò¥Î¤u§@²M³æ" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "±Ò¥Î³o­Óµøµ¡" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3034,7 +3041,7 @@ msgstr "" "Ãö³¬¹wÄý¦C¦L¼Ò¦¡\n" "¨ú®ø¹wÄý" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3053,23 +3060,23 @@ msgstr "" "WinMerge.Document\n" "WinMerge ¤å¥ó" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "«O¯d­ì©l EOL ¦r¤¸" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "«ö¥ô·NÁä" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "¹«¥kÁäÂIÀ»«Ý½Æ»sªº¸ô®|" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3078,152 +3085,152 @@ msgstr "" "¬ãµoªÌ¡G\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "WinMerge µ´¤£«OÃÒ³nÅéµL·å²«¡C¥¦¬O¦Û¥Ñ³nÅé¡AÅwªï¦b¬Y¨Ç±ø¥ó¤U¦A´²µo¥¦¡F²Ó¸`¨£»¡©ú¿ï³æ¤¤ªº GNU ¤½¦@±ÂÅvÃÒ¡C" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "½T©w(&O)" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "©ñ±ó(&A)" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "­«¸Õ(&R)" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "©¿²¤(&I)" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "¥þ³¡©¿²¤(&A)" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "¬O(&Y)" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "¥þ³¡¬Ò¬O(&A)" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "¤£(&N)" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "¥þ³¡¬Ò¤£(&L)" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "Ä~Äò(&C)" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "²¤¹L(&S)" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "¥þ³¡²¤¹L(&A)" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "¤£­n¦AÅã¥Ü³o­Ó°T®§(&M)" -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "¤£­n¦A´£¥Ü³o­Ó°ÝÃD(&Q)" -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "»yªk¦â±m" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "¤å¦r¦â±m" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "ª©¥»±±¨î" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "¨ì¡G" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "±q¥ªÃä¡G" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "¨ì¥ªÃä¡G" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "±q¥kÃä¡G" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "¨ì¥kÃä¡G" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "ª©¥» %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "¸U°ê½X" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "¿ï¶µ (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "©Ò¦³°T®§²°²{¦b·|¦AÅã¥Ü¡C" -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Àɮפñ¹ïªº³]©w¤w³Q­×§ï¡C­«·s±Ò°Ê¤ñ¹ï¡A¨º¨Ç³]©w¤~·|¥Í®Ä¡C" -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "©Ò¿ï¦r«¬¤§Åܧ󤣷|®M¥Î¨ì¥ô¦ó¥Ø«eÅã²{®t²§ªºµøµ¡¡C" -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3234,7 +3241,7 @@ msgstr "" "\n" "½Ð¥Î­È 1 - %1¡C" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3245,107 +3252,107 @@ msgstr "" "\n" "­«³]«á½Ð­«·s±Ò°Ê WinMerge¡C" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "¶}±Ò" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "µ{¦¡|*.exe;*.bat;*.cmd|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ±M®×ÀÉ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "¿ï¶µÀÉ (*.ini)|*.ini|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ÀÉ (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÀÉ (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "§¹¾ã¤º®e" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "§Ö³t¤º®e" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "­×§ï¤é´Á" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "­×§ï¤é´Á»P¤j¤p" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "¤j¤p" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "¦WºÙ" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "¦ì¸m" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "¿z¿ï¤è¦¡" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "´y­z" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "¥H·s¿z¿ï¤è¦¡¿ï¨úÀɦW" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Àɮ׿z¿ï¤è¦¡ (*.flt)|*.flt|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3357,7 +3364,7 @@ msgstr "" "\n" "½Ð½Æ»sÀÉ®× %1 ¨ì WinMerge/Àɮ׿z¿ï¤è¦¡-¸ê®Æ§¨¡C" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3370,7 +3377,7 @@ msgstr "" "\n" "½Ð½T©w¦³¸Ó¸ê®Æ§¨¡A¦Ó¥B¤¹³\¼g¤J¡C" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3381,7 +3388,7 @@ msgstr "" "\n" "½Ð©ó¡u¿ï¶µ/¨t²Î¡v¤¤¿ï©wÀɮ׿z¿ï¤è¦¡¸ê®Æ§¨¡C" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3394,12 +3401,12 @@ msgstr "" "\n" "¥¦¬O°ßŪÀÉ¡H" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Âê©wÀɮ׿z¿ï¤è¦¡ÀÉ¥H¦w¸Ë" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3410,208 +3417,208 @@ msgstr "" "\n" "¤£¯à½Æ»s·sÀɮ׿z¿ï¤è¦¡ÀɨìÀɮ׿z¿ï¤è¦¡¸ê®Æ§¨¡C" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Àɮ׿z¿ï¤è¦¡Àɤw¦s¦b¡CÂл\¤§¡H" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Ãþ«¬ªí¦¡" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "¹F¨ì cleartool.exe ªº¸ô®|(&P)¡G" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "¹F¨ì SS.EXE ªº¸ô®|(&P)¡G" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "¸ê®Æ§¨¤ñ¹ïµ²ªG" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Àɮפñ¹ï¤¤" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "¥¼³]¼ÐÃDªº¥ªÃä" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "¥¼³]¼ÐÃDªº¥kÃä" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "±½´yÀÉ®×..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "¶}±Ò¿ï¨ú" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "¥¿½Æ»s¥ªÃä¨ì¥kÃä" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "¥¿½Æ»s¥kÃä¨ì¥ªÃä" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "¥¿½Æ»s¥þ³¡¨ì¥ªÃä" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "¥¿½Æ»s¥þ³¡¨ì¥kÃä" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "¥¿½Æ»sÀÉ®×..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "¥¿§R°£ÀÉ®×..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "¥¿²¾°ÊÀÉ®×..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "¥¿²£¥Í³ø§i..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "¦æ¡G%s Äæ¡G%d/%d ¦r¤¸¡G%d/%d ¦æ¥½¡G%s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "¦æ¡G %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "¦æ¡G%s Äæ¡G%d/%d ¦r¤¸¡G%d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "¦X¨Ö" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "%2 ­Ó®t²§¤¤¤§²Ä %1" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "§ä¨ì %1 ­Ó®t²§" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "§ä¨ì 1 ­Ó®t²§" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "%2 ­Ó¶µ¥Ø¤§²Ä %1" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "¶µ¥Ø¡G%1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "¿ï¨ú¨â­Ó²{¦s¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "¸ê®Æ§¨¿ï¨ú" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "¿ï¨ú¨â­Ó¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï¡C" -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "¥ªÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "¥kÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "¨âÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "¿ï¾Ü¨â­ÓÀÉ®×¥H±Ò¥Î¸Ñ¥]¾¹¿ï¨ú¡C" -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "µLªk¤ñ¸ûÀɮשM¸ê®Æ§¨¡I" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "§ä¤£¨ìÀɮסG%1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "¥¼¸Ñ¥]ªºÀɮסG%1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3624,7 +3631,7 @@ msgstr "" "\n" "¬O¬Û¦Pªº¤G¶i¨îÀÉ¡C" -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3637,7 +3644,7 @@ msgstr "" "\n" "¬O¤£¦Pªº¤G¶i¨îÀÉ¡C" -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3648,7 +3655,7 @@ msgstr "" "\n" "¬O¤G¶i¨îÀÉ¡CµLªk¤ñ¸û¤G¶i¨îÀÉ©M¤å¦rÀÉ¡C" -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3661,37 +3668,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "¥t¦s·sÀÉ" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Àx¦s§ó§ï¨ì %1¡H" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Àˬd¥Ø¼Ð¼g¤J©Ê®Éµo¥Í¿ù»~" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "³Æ¥÷Àɮ׮ɵo¥Í¿ù»~" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3702,7 +3709,7 @@ msgstr "" "µLªk³Æ¥÷­ì©lªºÀɮסC\n" "¤´ÂÂÄ~Äò¶Ü¡H" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3717,7 +3724,7 @@ msgstr "" "%2\n" "­n¥H¤£¦P¦WºÙÀx¦sÀɮ׶ܡH" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3732,7 +3739,7 @@ msgstr "" "\n" "­nÀx¦s¸Ñ¥]ª©¦¨¥t¤@Àɮ׶ܡH" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3747,7 +3754,7 @@ msgstr "" "\n" "§A­nÀx¦s¸Ñ«Ê¥]ª©¥»¬°¥t¤@Àɮ׶ܡH" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3762,7 +3769,7 @@ msgstr "" "\n" "­nÂмg¨º§ó·s¹LªºÀɮ׶ܡH" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3771,7 +3778,7 @@ msgstr "" "%1\n" "¤w¼Ð°O¦¨°ßŪ¡C¤´­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3786,17 +3793,17 @@ msgstr "" "\n" "¦p­n­«¾ãÀɮסA½ÐÃö³¬¥Ø«e¤ñ¸û¡A­«·s¸ü¤JÀɮסC" -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Àx¦s¥ªÃäÀɮ׬°" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Àx¦s¥kÃäÀɮ׬°" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3804,42 +3811,42 @@ msgid "" "Refresh documents before continuing." msgstr "¦p¥¼­«¾ãÀɮסAWinMerge ¤£¯à¨Ö¤J²§°Ê¡C" -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "¥Ñ VSS ¨ú¥XÀÉ®×..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "°õ¦æª©¥»¨t²Î«ü¥O®Éµo¥Í¿ù»~¡C" -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "§ä¤£¨ì VSS ¸ê®Æ®w¡I" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "VSS µo¥Í¿ù»~¡G" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3850,7 +3857,7 @@ msgstr "" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C\n" " ºM¦^¨ú¥X¡H" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3859,179 +3866,179 @@ msgstr "" "ºM¦^¨ú¥XÀɮ׮ɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡C\n" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C" -#: Merge.rc:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "µL" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (¦­©ó 5.0 ª©)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ª©©M§ó±ßªºª©¥»)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "ªÅ¥Õ³B¤¤Â_" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "ªÅ¥Õ³B©Î¼ÐÂI³B¤¤Â_" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "½Æ»s¿ï¨ú¶µ¨ìnamed ¥Ø¿ý" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "½Æ»s¿ï¨ú¶µ¨ì¦Û­q¥Ø¿ý" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "§R°£¥ªÃ䪺¿ï¨ú¶µ¥Ø" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "§R°£¥kÃ䪺¿ï¨ú¶µ¥Ø" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "§R°£¨âÃ䪺¿ï¨ú¶µ¥Ø" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "ÁôÂÿï¨ú¶µ¥Ø (¦Û°Ê¿z¿ï¤è¦¡)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "¨âÃä¿ï¨ú¶µ¥Ø³£­«·s©R¦W" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "¥kÃä¨ì¥ªÃä (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "¥ªÃä¨ì¥kÃä (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "¥kÃä¨ì¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¥ªÃä¨ì¥kÃä (%2 ¤§ %1)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "¥ªÃä¨ì... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "¥kÃä¨ì... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "¥ªÃä¨ì... (%2 ¤§ %1)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "¥kÃä¨ì... (%2 ¤§ %1)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "¥ªÃä (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "¥kÃä (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "¨âÃä (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "¥kÃä (%2 ¤§ %1)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "¨âÃä (%2 ¤§ %1)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "¿ï¨ú¥Ø¼Ð¸ê®Æ§¨" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "¥ªÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "¥kÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ¨ü¼vÅTÀÉ®×)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%2 ¨ü¼vÅTÀɮפ§ %1)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "½T©w­n½Æ»s©Ò¦³®t²§¨ì¥ªÃäÀɮסH" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "½T©w­n½Æ»s©Ò¦³®t²§¨ì¥kÃäÀɮסH" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4047,17 +4054,17 @@ msgstr "" "%2\n" "¡H" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "½T©w­n½Æ»s %2 ¿ï¨ú¶µ¥Ø¤§ %1¡H" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "§A½T©w­n§R°£ %2 ¿ï¨ú¶µ¥Ø¤§ %1¡H" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4068,7 +4075,7 @@ msgstr "" "\n" "%1¡H" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4079,17 +4086,17 @@ msgstr "" "\n" "%1¡H" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "½T©w­n½Æ»s¡G" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "½T©w­n½Æ»s %d ¶µ¥Ø¡G" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4108,458 +4115,458 @@ msgstr "" "\n" "½Ð­«¾ã¤ñ¸û¡C" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "¶}±Ò¥ªÃäÀÉ®×" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "¶}±Ò¥ªÃäÀɮרì¥~³¡½s¿è¾¹" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "¥H...¶}±Ò¥ªÃäÀÉ®×" -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "¶}±Ò¥kÃäÀÉ®×" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "¶}±Ò¥kÃäÀɮרì¥~³¡½s¿è¾¹" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "¥H...¶}±Ò¥kÃäÀÉ®×" -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "µLªk°õ¦æ¥~³¡½s¿è¾¹ %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "¥¼ª¾°ÆÀɦW©ó¥~³¡½s¿è¾¹¡G%1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "½Æ»sÀɦW¨ì°Å¶Kï" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "½Æ»s¥ªÃä®|¦W¨ì°Å¶Kï" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "½Æ»s¥kÃä®|¦W¨ì°Å¶Kï" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "½Æ»s¨âÃä®|¦W¨ì°Å¶Kï" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "¥¼ª¾À£ÁY®æ¦¡" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "¥ªÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "¥kÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "¨âÃ䶵¥Ø¥[¨ìÀ£ÁYÀÉ" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "¨âÃä¬Û²§¶µ¥Ø¥[¤J¨ìÀ£ÁYÀÉ" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "¥ªÃä¿ï¨ú¶µ¥Ø²¾¨ì¦Û­q¸ê®Æ§¨" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "¥kÃä¿ï¨ú¶µ¥Ø²¾¨ì¦Û­q¸ê®Æ§¨" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "ÀɮצWºÙ" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "¸ê®Æ§¨" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "¤ñ¹ïµ²ªG" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "¥ªÃä¤é´Á" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "¥kÃä¤é´Á" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "°ÆÀɦW" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "¥ªÃä¤j¤p" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "¥kÃä¤j¤p" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "¥kÃä¤j¤p (²)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "¥ªÃä¤j¤p (²)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "¥ªÃä«Ø¥ß®É¶¡" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "¥kÃä«Ø¥ß®É¶¡" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "¸û·sÀÉ®×" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "¥ªÃäÀɮת©¥»" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "¥kÃäÀɮת©¥»" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "²¦¡µ²ªG" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "¥ªÃäÄÝ©Ê" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "¥kÃäÄÝ©Ê" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "¥ªÃä EOL" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "¥kÃä EOL" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "¥ªÃä½s½X" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "¥kÃä½s½X" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "©¿²¤ªº®t²§" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "®t²§" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "¤G¶i¨î" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "µLªk¤ñ¸ûÀÉ®×" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "¤¤Â_ªº¶µ¥Ø" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "²¤¹LªºÀÉ®×" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "²¤¹Lªº¸ê®Æ§¨" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "¶È¥ªÃä¡G%1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "¶È¥kÃä¡G%1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "¤G¶i¨îÀɧ¹¥þ¬Û¦P" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "¤G¶i¨îÀɤ£¦P" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Àɮפ£¦P" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "¶È¥ªÃä" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "¶È¥kÃä" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "¿ù»~" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "¸g¹L®É¶¡¡G %ld ²@¬í" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "¤w¿ï¨ú 1 ­Ó¶µ¥Ø" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "¤w¿ï¨ú %1 ­Ó¶µ¥Ø" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "ÀɮצWºÙ©Î¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "¥]¬A¤l¸ê®Æ§¨®É¤§¤l¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "¤ñ¸ûµ²ªG¡Aªø¦¡ªí³æ¡C" -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "°ÆÀɦW¡C" -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "¥ªÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "¥kÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "¥ªÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "¥kÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "¥ªÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "¥kÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "§iª¾¨ºÃ䦳¸û·sªº­×§ï¤é´Á¡C" -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¥ªÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¥kÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "µu¦¡¤ñ¸ûµ²ªG¡C" -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "¥ªÃäÄÝ©Ê¡C" -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "¥kÃäÄÝ©Ê¡C" -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "¥ªÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "¥kÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "¥ªÃä½s½X¡C" -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "¥kÃä½s½X¡C" -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Àɮפ¤ªº®t²§­Ó¼Æ¡C¦¹¼Æ¤£¥]¬A³Q©¿²¤ªº®t²§¡C" -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "¬O¤G¶i¨îÀÉ¡A´NÅã¥Ü¬P¸¹ (*)" -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "¤ñ¸û %1 ©M %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "³r¸¹¤À¹j¦Cªí" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "¸õ®æ¸¹¤À¹j¦Cªí" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "³æ¯Â HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "³æ¯Â XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4568,47 +4575,47 @@ msgstr "" "²£¥Í³ø§i®Éµo¥Í¿ù»~¡G\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "¦¨¥\²£¥Í³ø§i¡C" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "¬Û¦PÀɮ׶}±Ò¨ì¨âÃä¡C" -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "©Ò¿ïÀɮק¹¥þ¬Û¦P¡C" -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "©Ò¿ï¸ê®Æ§¨¶È¦s©ó¥t¤@Ãä¡A¦]¦¹µLªk¶}±Ò¡C" -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "¤ñ¹ïÀɮ׮ɵo¥Í¿ù»~¡C" -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "¤G¶i¨îÀÉ®×µLªkª½±µ¥Øµø¤ñ¹ï¡C" -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "¸ê®Æ§¨ÀÉ®×µLªkª½±µ¥Øµø¤ñ¹ï¡C" -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4629,7 +4636,7 @@ msgstr "" "\n" "¡u©¿²¤´«¦æ¦r¤¸¤§®t²§¡v¡C" -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4640,22 +4647,22 @@ msgstr "" "¥H¥Ø«e¿ï¶µ¡A¥¦­Ì·|²Î¤@¨ì¥DÃþ«¬¡C\n" "§A­nÅܧó¿ï¶µ¨Ã«O¯d¤£¦PªºÀÉ®×µ²§ô¦r¤¸¶Ü¡H" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "¤@­Ó¿ù»~µo¥Í©ó«e¸m¤£¦PÀÉ®× '%1' ¥H¥~±¾ '%2'¡C «e¸m¤£¦PµLªk¦A®M¥Î¡C" -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "©Ò¿ïªº¸ê®Æ§¨µL®Ä¡C" -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "½s¿è¾¹¤£¯à¶}±Ò¤G¶i¨îÀÉ¡C" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4666,132 +4673,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "ĵ§i¡GÀɮרϥΤ£¦Pªº½s½X¡A¥ªÃä=%s¡A¥kÃä=%s¡A¦X¨Ö¥i¯à¾É­P¸ê°T·l¥¢¡C" -#: Merge.rc:2356 +#: Merge.rc:2359 #, 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:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "¦]½s½X°ÝÃD¾É­P¸ê°T·l¥¢¡G¥kÃäÀɮצp¦¹¡C" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "¦]½s½X°ÝÃD¾É­P¸ê°T·l¥¢¡G¥ªÃäÀɮצp¦¹¡C" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "µL®t²§" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "¦æ¤º®t²§" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "¤w¨ú¥N %1 ­Ó¦r¦ê¡C" -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "§ä¤£¨ì \"%s\" ¦r¦ê" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "½Æ»s§¹¾ã¸ô®|" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "½Æ»sÀɦW" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "¦ì¸mµ¡®æ" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "®t²§µ¡®æ" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "¸ÉºóÀɦ¨¥\¼g¤J¡C" -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "¸ÉºóÀɤw¦s¦b¡C­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 ­ÓÀɮפw¿ï¨ú]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "¤@¯ë" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "¯ßµ¸" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "¦P¤@¤Æ" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "µLªk¼g¤J¨ìÀÉ®× %1¡C" -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "«ü©wªº¿é¥X¸ô®|¤£¬Oµ´¹ï¸ô®|¡G%1" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "«ü©w¤@­Ó¿é¥XÀÉ" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "µLªk±q¤G¶i¨îÀɫظɺóÀÉ¡C" -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "µLªk±q¥Ø¿ý«Ø¸ÉºóÀÉ¡C" -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4802,17 +4809,17 @@ msgstr "" "\n" "«Ø¸ÉºóÀÉ«e±o¥ýÀx¦sÀɤº©Ò¦³²§°Ê¡C" -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "¸ê®Æ§¨¤£¦s¦b¡C" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "·|²M°£¥Ø«eªº¸ê®Æ§¨¤ñ¸ûµ²ªG¡C" -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4823,7 +4830,7 @@ msgstr "" "§ä¤£¨ì¤ä´©À£ÁYªº©Ò¦³¥²­n¤¸¥ó (7-zip ©M/©Î Merge7z*.dll)¡C\n" "½Ð°Ñ¦Ò¤â¥U¨ú±o§ó¦h¦³ÃöÀ£ÁY¤ä´©©M±Ò¥ÎÀ£ÁYªº¸ê°T¡C" -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4832,7 +4839,7 @@ msgstr "" "\n" "ª`·N¡GWinMerge ³]©w¤¤¤wÃö³¬ 7-Zip ¤§¾ã¦X¡C" -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4841,37 +4848,37 @@ msgstr "" "\n" "ª`·N¡GWinMerge ³]©w¤¤ 7-Zip ¤w³]¦¨¿W¥ß¹B§@¡C" -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "¿ï¨úÀÉ®×¥H¶×¥X" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "¿ï¨úÀÉ®×¥H¶×¤J" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "µLªk±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "µLªk¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4882,1099 +4889,1099 @@ msgstr "" "\n" "­nÄ~Äò¶Ü¡H" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Ãþ«¬ªí¦¡¿ù»~" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "¨S¦³²Å¦Xªí¦¡ªº" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "µL®ÄªºÃþ«¬ªí¦¡" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "µL®Äªº¤ñ¸û¦r¤¸" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "µL®Äªº¦r¤¸Ãþ¦WºÙ" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "©ì¦²¤Ï±×½u" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "µL®Äªº¦^°Ñ" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "[ or [^ ¤£§¹¾ã" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "( or \\( ¤£§¹¾ã" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "\\{ ¤£§¹¾ã" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\} ¤¤¬°µL®Ä¤º®e" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "µL®Äªº½d³ò¬É" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "°O¾ÐÅ餣¨¬" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "µL®Äªº«e¸mÃþ«¬ªí¦¡" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Ãþ«¬ªí¦¡¥¼§¹" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Ãþ«¬ªí¦¡¤Óªø" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "¥¼§ä¨ì ) or \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Afrikaans ªü´I¦½»y" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanian ªüº¸¤Ú¥§¨È»y" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabic (Saudi Arabian) ªü©Ô§B»y (¨F¯Q¦aªü©Ô§B)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabic (Iraq) ªü©Ô§B»y (¥ì©Ô§J)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabic (Egyptian) ªü©Ô§B»y (®J¤Î)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabic (Libyan) ªü©Ô§B»y (§Q¤ñ¨È)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabic (Algerian) ªü©Ô§B»y (ªüº¸¤Î§Q¨È)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabic (Moroccan) ªü©Ô§B»y (¼¯¬¥­ô)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabic (Tunisian) ªü©Ô§B»y (¬ð¥§¦è¨È)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabic (Oman) ªü©Ô§B»y (ªü°Ò)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabic (Yemen) ªü©Ô§B»y (¸­ªù)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabic (Syrian) ªü©Ô§B»y (±Ô§Q¨È)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabic (Jordan) ªü©Ô§B»y (¬ù¥¹)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabic (Lebanon) ªü©Ô§B»y (¾¤¤Ú¹à)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabic (Kuwait) ªü©Ô§B»y (¬ì«Â¯S)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabic (UAE) ªü©Ô§B»y (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabic (Bahrain) ªü©Ô§B»y (¤ÚªL)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabic (Qatar) ªü©Ô§B»y (¥d¹F)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armenian ªü°Ò¥§¨È»y" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azeri (Latin) ªü®ý¨½»y (©Ô¤B)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azeri (Cyrillic) ªü®ý¨½»y (¦è¨½¨½§J)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Basque ¤Ú´µ§J»y" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Belarusian ¨©©Ô¾|´µ»y" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgarian «O¥[§Q¨È»y" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalan ¥d¹FÄõ»y" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)¤¤¤å (¥¿Åé)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chinese (Simplified) ¤¤¤å (²Åé)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chinese (Hong Kong) ¤¤¤å (­»´ä)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chinese (Singapore) ¤¤¤å (·s¥[©Y)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chinese (Macau SAR) ¤¤¤å (¿Dªù)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Croatian §Jù®J¦è¨È»y" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Czech ±¶§J»y" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Dansk ¤¦«ä§J»y" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Dutch ²ü»y" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Dutch (Belgium) ²ü»y(¤ñ§Q®É)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "English (US) ­^»y (¬ü°ê)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "English (UK) ­^»y (­^°ê)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "English (Australian) ­^»y (¿D¬w)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "English (Canadian) ­^»y (¥[®³¤j)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "English (New Zealand) ­^»y (¯Ã¦èÄõ)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "English (Irish) ­^»y (·Rº¸Äõ)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "English (So. African) ­^»y («n«D)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "English (Jamaican) ­^»y (¨È¶R¥[)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "English (Caribbean) ­^»y (¥[°Ç¤ñ)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "English (Belize) ­^»y (¦Ê¨½´µ)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "English (Trinidad) ­^»y (¤d¨½¹F)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "English (Zimbabwe) ­^»y (¨¯¤Ú«Â)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "English (Philippines) ­^»y (µá«ß»«)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Eesti ·R¨F¥§¨È»y" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Faeroese ¤¦³Á¤§ Faeroese »y" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Farsi ªi´µ»y" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Suomi ªâÄõ»y" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "French ªk»y" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "French (Belgique) ªk»y (Belgique)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "French (Canada) ªk»y (¥[®³¤j)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "French (Switzerland) ªk»y (·ç¤h)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "French (Luxembourg) ªk»y (¿c´Ë³ù)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "French (Monaco) ªk»y (¼¯¯Ç­ô)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgian ³ìªv¨È»y" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "German (Germany) ¼w»y (¼w°ê)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "German (Switzerland) ¼w»y (·ç¤h)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "German (Austria) ¼w»y (¶ø¦a§Q)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "German (Luxembourg) ¼w»y (¿c´Ë³ù)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "German (Liechtenstein) ¼w»y (¦C¯÷©Z«ä©Z)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Greek §Æþ»y" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebrew §Æ§B¨Ó»y" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Hindi ¨¯¦a»y" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Hungarian ¦I¤ú§Q»y" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Icelandic ¦B®q»y" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesian ¦L¥§»y" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italian ¸q»y" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italian (Swiss) ¸q»y (·ç¤h)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japanese ¤é»y" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmiri (India) ¥d«ä±K¥§»y (¦L«×)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Kazakh ¥d©Ô§J»y" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Korean Áú»y" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Korean (Johab) Áú»y (¬ù¦X§B)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Latvian ©Ô²æºû¨È»y" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lithuanian ¥ß³³©{»y" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malay (Malaysian) °¨¨Ó¨È»y (°¨¨Ó¦è¨È)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malay (Brunei Darussalam) °¨¨Ó¨È»y (ͲµÜ)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "Manipuri °Ò¥§´¶¨½»y" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norwegian (Bokml) ®¿«Â»y (ªi§J°¨)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norwegian (Nynorsk) ®¿«Â»y (¥§¿Õ´µ§J)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polski ªi«ä°ò»y" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugese ¸²µå¤ú»y" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugese (Brazil) ¸²µå¤ú»y (¤Ú¦è)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Romanian ù°¨¥§¨È»y" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russian ¿W¥ß°ê¨ó»y" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sanskrit ±ë»y" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbian (Latin) ¶ë¤ñ¨È»y (©Ô¤B)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbian (Cyrillic) ¶ë¤ñ¨È»y (¦è¨½¨½§J)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "Sindhi ¨¯¦a»y" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Slovak «äµ¸¥ï§J»y" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Slovenian «äµ¸¤Z¥§¨È»y" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Spanish ¦è¯Z¤ú»y" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Spanish (Mexican) ¦è¯Z¤ú»y (¾¥¦è­ô)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Spanish (Modern) ¦è¯Z¤ú»y (²{¥N)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Spanish (Guatemala) ¦è¯Z¤ú»y (¥Ê¦a°¨©Ô)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Spanish (Costa Rica) ¦è¯Z¤ú»y (­ô«ä¹F¾¤¥[)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Spanish (Panama) ¦è¯Z¤ú»y (¤Ú®³°¨)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Spanish (Dominican) ¦è¯Z¤ú»y (¦h©ú¥§¥[)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Spanish (Venezuela) ¦è¯Z¤ú»y (©e¤º·ç©Ô)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Spanish (Colombia) ¦è¯Z¤ú»y (­ô­Û¤ñ¨È)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Spanish (Peru) ¦è¯Z¤ú»y (±K¾|)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Spanish (Argentina) ¦è¯Z¤ú»y (ªü®Ú§Ê)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Spanish (Ecuador) ¦è¯Z¤ú»y (¤Ì¥Ê¦hº¸)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Spanish (Chile) ¦è¯Z¤ú»y (´¼§Q)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Spanish (Uruguay) ¦è¯Z¤ú»y (¯Q©Ô¦c)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Spanish (Paraguay) ¦è¯Z¤ú»y (¤Ú©Ô¦c)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Spanish (Bolivia) ¦è¯Z¤ú»y (¬Á§Qºû¨È)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Spanish (El Salvador) ¦è¯Z¤ú»y (Âĺ¸¥Ë¦h)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Spanish (Honduras) ¦è¯Z¤ú»y (§»³£©Ô´µ)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Spanish (Nicaragua) ¦è¯Z¤ú»y (¥§¥[©Ô¥Ê)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Spanish (Puerto Rico) ¦è¯Z¤ú»y (ªi¦h¾¤¦U)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Kenya) «ä¥Ë§Æ§Q»y (ªÖ¨È)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Swedish ·ç¨å»y" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Swedish (Finland) ·ç¨å»y (ªâÄõ)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tamil ¶ð±K»y" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatar (Tatarstan) ¶ð¹F»y (¶ð¹F«ä©Z)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Thai ®õ»y" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turkish ¤g¦Õ¨ä»y" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ukranian ¯Q§JÄõ»y" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "Urdu (Pakistan) «Î«×»y (¤Ú°ò´µ©Z)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (India) «Î«×»y (¦L«×)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbek (Latin) ¯Q¯÷§O§J»y (©Ô¤B)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbek (Cyrillic) ¯Q¯÷§O§J»y (¦è¨½¨½§J)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamese ¶V«n»y" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Western European ¦è¼Ú" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Eastern European ªF¼Ú" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "East Asian ªF¨È" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian ªF«n©M¦è«n¨È" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Middle Eastern ¤¤¨È" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Not applicable µL¥i¾A¥Î" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "MS-Windows ·L³nµøµ¡§@·~¨t²Î" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "MS-DOS ·L³n DOS §@·~¨t²Î" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "Macintosh ³Áª÷¶ð§@·~¨t²Î" # According to the rc file. It has to do with CODEPAGE PLATFORM GROUPS. As I can know, "IBM" is not a name of operating system. So the original string is wrong. And I remain the string untranslated. -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic ¦è¨½¨½§J»y" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US ©Ô¤B¬ü¬w" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic ªü©Ô§B»y" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek §Æþ»y" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim ªiùªº®ü¨½©i»y" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1 ©Ô¤B 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1 §Æþ»y 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2 ©Ô¤B 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic ¦è¨½¨½§J»y" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish ¤g¦Õ¨ä»y" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese ¸²µå¤ú»y" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic ¦B®q»y" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew §Æ§B¨Ó»y" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada ªkÄÝ¥[®³¤j" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic ¥_·¥" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic ¦è¨½¨½§J»y CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2 §Æþ»y 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Thai ®õ»y" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese ¤é»y" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese ²Å餤¤å" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Korean Áú»y" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese ¥¿Å餤¤å" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2 ©Ô¤B 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic) ¦è¨½¨½§J»y (´µ©Ô¤Ò)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1 ©Ô¤B 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Greek §Æþ»y" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish) ©Ô¤B 5 (¤g¦Õ¨ä)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew §Æ§B¨Ó»y" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic ªü©Ô§B»y" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim ªiùªº®ü¨½©i»y" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese ¶V«n»y" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman ù°¨»y" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek §Æþ»y" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic ¦è¨½¨½§J»y" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "Macintosh" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe ¤¤¼Ú" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish ¤g¦Õ¨ä»y" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "±µªñ ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "±µªñ ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "±µªñ ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "±µªñ ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "±µªñ ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "²V¦X" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Àx¦s¥ªÃäÀÉ®×" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Àx¦s¥kÃäÀÉ®×" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Àx¦s¥ªÃäÀÉ®×¥H¦WºÙ..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Àx¦s¥kÃäÀÉ®×¥H¦WºÙ..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Åܧó¥ªÃäÀÉ®×/¸ê®Æ§¨°ßŪª¬ºA" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Åܧó¥kÃäÀÉ®×/¸ê®Æ§¨°ßŪª¬ºA" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Âà´«¦æ§À¦r¤¸¬° DOS ¦¡" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Âà´«¦æ§À¦r¤¸¬° UNIX ¦¡" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Âà´«¦æ§À¦r¤¸¬° MAC ¦¡" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "½s¿è©M¦X¨Ö¼Ò¦¡¤Á´«" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5983,12 +5990,12 @@ msgstr "" "À˵ø»P½Õ¾ãÀÉ®×½s½X\n" "ÀÉ®×½s½X" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5997,7 +6004,7 @@ msgstr "" "¿ï¨ú¥Ø«e¦æ¤§®t²§³¡¥÷\n" "¥Ø«e¦æ¤§®t²§" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6006,7 +6013,7 @@ msgstr "" "²¾¦Ü¬Y¦æ©Î¬Y¬Û²§°Ï¶ô\n" "²¾¦Ü (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6015,7 +6022,7 @@ msgstr "" "³]©wµ{¦¡¿ï¶µ\n" "¿ï¶µ" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6024,37 +6031,37 @@ msgstr "" "­«¾ã«áÅã¥Ü\n" "­«¾ã (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "½Æ»s¿ï¨ú¦æ¨ì°Å¶Kï(ªþ¥[¦æ¸¹©ó¦æ­º)" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "­«¾ã¿ï¨ú¶µ" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "¶}Ãö®ÑÅÒ" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "¦Ü¤U¤@®ÑÅÒ" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "¦Ü¤W¤@®ÑÅÒ" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "²M°£©Ò¦³®ÑÅÒ" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6063,7 +6070,7 @@ msgstr "" "Åã¥Ü§¹¥þ¬Û¦Pªº¶µ¥Ø\n" "Åã¥Ü¬Û¦P¶µ¥Ø" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6072,7 +6079,7 @@ msgstr "" "Åã¥Ü¬Û²§ªº¶µ¥Ø\n" "Åã¥Ü¬Û²§¶µ¥Ø" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6081,7 +6088,7 @@ msgstr "" "Åã¥Ü¥u¦b¥ªÃ䦳ªº¶µ¥Ø\n" "Åã¥Ü¥ªÃä¿W¦³¶µ¥Ø" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6090,7 +6097,7 @@ msgstr "" "Åã¥Ü¥u¦b¥kÃ䦳ªº¶µ¥Ø\n" "Åã¥Ü¥kÃä¿W¦³¶µ¥Ø" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6099,7 +6106,7 @@ msgstr "" "Åã¥Ü¤G¶i¨îÀÉ®×\n" "Åã¥Ü¤G¶i¨îÀÉ®×" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6108,7 +6115,7 @@ msgstr "" "Åã¥Ü²¤¹Lªº¶µ¥Ø\n" "Åã¥Ü²¤¹Lªº¶µ¥Ø" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6117,7 +6124,7 @@ msgstr "" "¿ï¨úÀ˵ø¥Î¦r«¬\n" "¿ï¨úÀ˵ø¦r«¬" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6126,27 +6133,27 @@ msgstr "" "«ì´_¨Ï¥Î¹w³]ªº¨t²Î¦r«¬©óÀ˵ø\n" "¹w³]ªº¦r«¬" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Åã¥ÜªÅ¥Õ©M¸õ®æ¦r¤¸" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "¶}Ãö®t²§µ¡®æ" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "¦ì¸mµ¡®æÅã¥ÜÀÉ®×¥þ¹³" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Åã¥Ü¸ê®Æ§¨¤ñ¸û¤§²Î­p¹ï¸Ü²°" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6155,7 +6162,7 @@ msgstr "" "¿ï¨ú¥Ø«e¨Ï¥ÎªÌ¤¶­±»y¨¥\n" "»y¨¥" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6164,12 +6171,12 @@ msgstr "" "¥H¤£¦P¦â±mÅã¥Ü¦æ¤º®t²§\n" "Åã¥Ü¦æ¤º®t²§" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "¹ï½Õ¨âµ¡®æ¦ì¸m" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6178,7 +6185,7 @@ msgstr "" "Åã¥Ü¦æ¸¹\n" "Åã¥Ü¦æ¸¹" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6187,7 +6194,7 @@ msgstr "" "±Ò¥Î¦Û°Ê§é¦æ\n" "¦Û°Ê§é¦æ" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6196,17 +6203,17 @@ msgstr "" "Åã¥Ü¨âµ¡¤§Ãä°Ï\n" "Åã¥Ü¨âµ¡Ãä°Ï" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6215,7 +6222,7 @@ msgstr "" "±²¨ì¤W¤@®t²§\n" "¤W¤@®t²§ (Alt + Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6224,7 +6231,7 @@ msgstr "" "±²¨ì¤U¤@®t²§\n" "¤U¤@®t²§ (Alt + Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6233,7 +6240,7 @@ msgstr "" "±²¨ì³Ìªì®t²§\n" "³Ìªì®t²§ (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6242,7 +6249,7 @@ msgstr "" "±²¨ì¥Ø«e®t²§\n" "¥Ø«e®t²§ (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6251,7 +6258,7 @@ msgstr "" "±²¨ì³Ì¥½®t²§\n" "³Ì¥½®t²§ (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6260,7 +6267,7 @@ msgstr "" "½Æ»s®t²§°Ï¶ô¨ì¥kÃäÀÉ®×\n" "½Æ»s¨ì¥kÃä (Alt + Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6269,7 +6276,7 @@ msgstr "" "½Æ»s®t²§°Ï¶ô¨ì¥ªÃäÀÉ®×\n" "½Æ»s¨ì¥ªÃä (Alt + Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6278,7 +6285,7 @@ msgstr "" "½Æ»s®t²§¨ì¥kÃä¨Ã¨ì¤U¤@®t²§\n" "½Æ»s¨ì¥kÃä¨Ã«e¶i (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6287,7 +6294,7 @@ msgstr "" "½Æ»s®t²§¨ì¥ªÃä¨Ã¨ì¤U¤@®t²§\n" "½Æ»s¨ì¥ªÃä¨Ã«e¶i (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6296,7 +6303,7 @@ msgstr "" "½Æ»s©Ò¦³®t²§¨ì¥kÃäÀÉ®×\n" "©Ò¦³¨ì¥kÃä" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6305,76 +6312,76 @@ msgstr "" "½Æ»s©Ò¦³®t²§¨ì¥ªÃäÀÉ®×\n" "©Ò¦³¨ì¥ªÃä" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "±q¨âÃä¥Ø¿ý°»´ú©Ò¦³¶µ¥Ø" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "¤ñ¸û¿ï¨ú¶µ¥Ø(­Y¬°¦h­«¿ï¨ú¶µ¥Ø¡A¤ñ¸û¨ä²Ä¤@­Ó¶µ¥Ø)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "¿ï¨ú¨Ã¬ö¿ý¸ê®Æ§¨¤ñ¸ûÄæ¦ì" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "²£¥Í¸ÉºóÀÉ" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "¿ï¨ú¨Ã­×§ï¿z¿ï¤è¦¡" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "±q¤ñ¸ûµ²ªG²£¥Í³ø§i" # Instead of "The user selects the unpacker (no unpacking when comparing dir)" I would suggest "The user selects the unpacker (no automatic unpacking non-text files when comparing dir)". -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "¨Ï¥ÎªÌ¿ï¨ú¸Ñ¥]¾¹(¤ñ¸û¸ê®Æ§¨®É¤£¦Û°Ê¸Ñ¶}«D¯Â¤å¦rÀÉ®×)" # Instead of "one file only needs the extension" I would suggest "at least one file should have a needed extension". -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "¥H¿ï¥Îªº¸Ñ¥]¾¹¥Î¨ì¨â­ÓÀÉ (¦Ü¤Ö¤@­ÓÀɮ׻ݰÆÀɦW)" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "¿ï¤@­Ó¸Ñ¥]¾¹¥H½s¿è³o­ÓÀÉ®×" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "¤£­n¥ý¦æ³B²z¾¹ (±`ºA)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "«Øijªº¥~±¾" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "¨ä¥L¥~±¾" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "¨ø¸ü©Ò¦³¥~±¾¦A­«·s¸ü¤J (¾A¥Îµo®iªÌ)" # 2.7.4 # The original text is strange because the next file is always visible. The correct one is "Activate next file" or "Change the focus to next file", etc. So Chinese translation does not fully follow the original text. -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6383,12 +6390,12 @@ msgstr "" "¤Á´«µJÂI¦Ü¥t¤@ÀÉ\n" "¤Á´«¦Ü¥t¤@ÀÉ" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Ãö³¬©Ò¦³¶}±Òµøµ¡" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6397,22 +6404,22 @@ msgstr "" "Åã¥Ü WinMerge ¨Ï¥Î«ü«n\n" "»¡©ú" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "¿é¥X¥Ø«e WinMerge ª©¥»¸ê°T¤Î¨ä²ÕºA¨ì¤å¦rÀÉ®×" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Åã¥Ü GNU ¤½¦@±ÂÅvÃÒ" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "¨p¤H½sĶ¡G%1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6421,7 +6428,7 @@ msgstr "" "¶}±Ò WinMerge »¡©ú¯Á¤Þ\n" "»¡©ú¯Á¤Þ" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6430,267 +6437,272 @@ msgstr "" "·j´M WinMerge ¤§»¡©ú\n" "·j´M»¡©ú" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "¥~±¾³]©w" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "¤£­n¥Î¥ý¦æ³B²z¾¹" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "¦p¥i¯à´N¥Î¥ý¦æ³B²z¾¹" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "§ä¤£¨ì WSH - °±¥Î .sct «ü¥O½X" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "<µL>" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "<¦Û°Ê>" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "¥Hµn¿ýªºÀ³¥Îµ{¦¡¶}±ÒÀÉ®×" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "¥H¥~¦b½s¿è¾¹¶}±ÒÀÉ®×" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "¥H¯S©wÀ³¥Îµ{¦¡¶}±ÒÀÉ®×" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "¤£Åã¥Ü²¾¦ìªº°Ï¶ô" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Åã¥Ü©Ò¦³²¾¦ìªº°Ï¶ô" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "¶È´N¥Ø«e¬Û²§³BÅã¥Ü¨ä²¾¦ìªº°Ï¶ô" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "¸õ¨ì²{¦b¹«¼Ð¤U©Ò¥Ü¦æ" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "¦Ü %2 ¤§²Ä %1 ¬Û²§³B(&O)" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "¦Ü²Ä %1 ¦æ(&O)" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Ãö³¬" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "±qÀɮרt²Î" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "±q MRU ªí" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "ÁôÂäu¨ã¦C" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Åã¥Ü¤p¤u¨ã¦C" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Åã¥Ü¤j¤u¨ã¦C" diff --git a/Src/Languages/Croatian.po b/Src/Languages/Croatian.po index e41f0b2f6..9f48e593a 100644 --- a/Src/Languages/Croatian.po +++ b/Src/Languages/Croatian.po @@ -72,7 +72,7 @@ msgstr "Od&re #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Kopiraj" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "&Zalijepi" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "Idi &na redak" @@ -95,43 +95,43 @@ msgid "Op&en" msgstr "&Otvori" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "in&staliranim programom" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "&vanjskim ureðivaèem" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&s..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Datoteka" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Nova usporedba\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Usporedi...\tCtrl+O" @@ -147,8 +147,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Otvori usporedbu...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Po&hrani usporedbu..." @@ -159,1845 +159,1852 @@ msgid "Recent Projects" msgstr "Zadnje usporedbe" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Izlaz" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Ureðivanje" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Postavke..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Izgled" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Izbor &fonta..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Koristi standardni f&ont" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "&Traka alata" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "&Nevidljiva" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "&Male ikone" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Velike ikone" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "Traka &statusa" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "Traka &oznaka panela" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Jezik..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Alati" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtri..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Pohrani razlike (Patch)..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Dodaci" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "&Ruèno raspakiravanje" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatsko raspakiravanje" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Ureðivanje u arhiveru" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Uèitaj dodatke ponovo" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "&Ispravak" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "Uèitaj postavke..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "&Standardne postavke" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "Paneli i &Okna" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Zatvori panele" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Zatvori &sve panele" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Drugi &panel\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Okna &vodoravno" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Okna &okomito" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "Okna &kaskadno" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Pomoæ" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Sadržaj...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Indeks..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Naði..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "Po&dešenost..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Onemoguæavanje rada s a&rhivama..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "&GNU javna licenca..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&O WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Otvori &usporedbu...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "L&ijeva samo za èitanje" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "D&esna samo za èitanje" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "&Kodiranje datoteke" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Oznaèi &sve\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Prikaži &identiène stavke" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Prikaži &razlièite stavke" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Prikaži l&ijeve unikatne stavke" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Prikaži d&esne unikatne stavke" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Prikaži &izostavljene stavke" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Prikaži &binarne datoteke" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Prikaži skri&vene stavke" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Usporedbena &statistika" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "Osv&ježi\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Osvježi odabir\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Vezano" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Us&poredi\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Slijedeæa razlika\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Prethodna razlika\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Prva razlika\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktivna razlika\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Zadnja razlika\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiraj u &desno\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiraj u &lijevo\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Obriši\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Prilagodba kolona..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Pohrani &izvještaj..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Pohrani\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Pohrani &lijevu datoteku" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Pohrani" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Pohrani &kao..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Pohrani &desnu datoteku" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Ispis" -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "Postava &stranice" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "&Pregled ispisa" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Završi retke prema" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "&DOS (CRLF)" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "&UNIX (LF)" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "&MAC (CR)" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Vezani naèin" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Poništi\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Vrati\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Od&reži\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopiraj\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Zalijepi\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Istakni &razliku\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Naði...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Zamijeni...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Skripte" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< ništa >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Dodatno" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiraj s brojevima redaka\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Oznake" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Zamijeni oznake\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Slijedeæa oznaka\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Prethodna oznaka\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "Ukloni sve oznake" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Idi &na...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Oznaèavanje sintakse" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "Za&kljuèaj panele" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Skriveni znaci i pra&znine" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Prikaži razlèitost &redaka" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Prikaži &brojeve redaka" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Prikaži &margine" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "Pre&lomi retke" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "&Zamijeni panele" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Panel &razlika" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Panel &položaja" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopiraj u de&sno i nastavi\tAlt+Ctrl+desno" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiraj u lije&vo i nastavi\tAlt+Ctrl+lijevo" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Kopiraj sve u des&no" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Kopiraj sve u &lijev&o" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "&Usporedba" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&Lijevi do desni" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "L&ijevi do..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "&Desni do lijevi" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "D&esni do..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Pre&mjesti" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Lijevi do..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&Desni do..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Obriši" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&lijeva" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&desna" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Obje" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "P&reimenuj" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "&Sakrij stavke" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "&Otvori lijevi" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Otvori &desni" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiraj &stazu" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Lijevo (%1 od %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "Desno (%1 od %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Obje (%1 od %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Kopiraj &nazive datoteka" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Lijevo... (%1 od %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Desno...(%1 od %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Obje...(%1 od %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Razlike... (%1 od %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "&Osvježi" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "&Kopiraj stazu" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Kopiraj &naziv datoteke" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Prediffer postavke " -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Nema prediffer_a" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Auto prediffer" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Idi &na razliku" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Ne premještaj blokove" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "Premještaj &svih blokova" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Premjesti blok &ove razlike" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "O WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(Osobni uradak)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Sva prava su zadržana" -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMerge stranica na Web-u" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "U redu" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Suradnici" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Odabir datoteke ili mape" -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Lijevi panel:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Odabir..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Desni panel:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "O&dabir..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Filtar" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Od&abir..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "&Arhiver:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Oda&bir..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "Ukljuèi i &podmape" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Odustajem" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Pomoæ" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Datoteke ili mape za usporedbu" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Baza podataka:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Usporedba:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Korisnik:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Lozinka" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Poveži s odredišnom VSS usporedbom" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Primijeni na sve stavke" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Provjera" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Pohrana kao..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Izbor programa:" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Izbor programa:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Staza do cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Opæe" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Uvijek kreni od &prve razlike" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Bez uvodnog okna" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zatvori usporedbu tipkom &ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Prethodno provjeri stazu u dijalogu odabira" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "Samo &jedna instanca WinMerge-a" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "&Upitaj prije zatvaranja višestrukih usporedbi" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Otvori dijalog &samodovršenja" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Omoguæi višestruke usporedbe pri" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Usporedbi &mapa" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Usporedbi &datoteka" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Poništi" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Jezik" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Raspoloživi jezici:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Naði" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Pojam:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Poklapanje &cijele rijeèi" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Osjetljivost na V/m slova" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "&Algoritam" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "Ne prelamaj završetak datoteke" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Smjer" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Gore" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "&Dole" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "Traži &slijedeæi" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Zamijeni" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Zamijeni s:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "&Bez preloma teksta" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Zamijeni u" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "oznaèenom" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "&cijeloj datoteci" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Zamijeni" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Zamijeni &sve" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Racionalno ClearCase" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "Provjeri" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Komentari" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "Provjeri ponovo" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Filtar redaka" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Omoguæi filtriranje redaka" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ispravan algoritam (jedan po retku):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Pohrani" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "Novi" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Ureðivanje" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "Ukloni" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Boje" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Razlike:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Oznaèena razlika:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Pozadina" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Obrisano" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Zanemarene razlike:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Premješteno:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Premještaj oznaèenog:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Razlièite rijeèi:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Razlike oznaèene rijeèi:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Predpodešeno" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Dijalog" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Sistem" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Premjesti obrisano u koš?" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "&Zanemari razlike manje od 3 sekunde" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integracija" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "Dodaj u Explorer kontekst izbornik." -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Omoguæi &napredni izbornik." -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "Uvijek ukljuèi i &podmape" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Vanjski ureðivaè:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "&Naziv mape filtara:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Odabir..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Pohrana razlika (Patch)" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "&Lijeva dat." -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "&Desna dat." -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "&Odabir..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "&Obrni D<->L" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "&Prikljuèi postojeæoj datoteci" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Pohranu u:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "&Naèin prikaza" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "St&il" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Dubina:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "&Praznine prema" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "&Usporedbi" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Zanemari &izmjene" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Zanemari &sve" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "&Zanemari prazne retke" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "&Razlikuj V/m slova" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "&Ukljuèi naredbeni redak" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Otvori u vanjskom pregledniku." -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Prikaži kolone" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "Po&digni" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "&Spusti" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Izbor arhivera" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Arhiver datoteka:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Prikaži sve arhivere bez provjere ekstenzije" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Popis ekstenzija" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Opis:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "Napredak usporedbe mapa" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Stani" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Usporedba stavki..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Stavki usporeðeno:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Stavki ukupno:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Idi na" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "Redak &br:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "datoteku" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "u datoteci" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "&redak" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&razliku" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "Idi &na" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Usporedba" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Skriveni znaci i praznine" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "&Usporedi" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "Zanemari &izmjene" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Zanemari &sve" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Zanemari prazne &retke" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Zanemari V/m &slova" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "&Zanemari razlièitost oznaka završetka retka (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Omoguæi &razlikovanje premještenih blokova" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "&Jednake retke" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Usporedi &datoteke prema" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "&Zastani na prvoj razlici" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Filtriraj komentare" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Ureðivanje" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "&Istakni sintaksu" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "&Automatski ponovo pretraži" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "Zadrži izvorni naèin oznaèavanja kraja redaka" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulatori" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Velièina tabulatora" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "&Umetni tabulator" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "&Umetni razmak" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Isticanje razlièitosti" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Unutar retka" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "Svaki &znak" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "&Rijeæ:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filtar redaka" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Instaliraj..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Novi..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Ureðivanje..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Brisanje..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Pohraniti izmijenjenu datoteku?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Datoteka s lijeva" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Pohrani promjene" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Odustajem od izmjena" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Datoteka s desna" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "Pohrani promjene" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Odustajem od izmjena" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Sve odustajem" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Kodna stranica" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Standardna kodna stranica" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2006,56 +2013,56 @@ msgstr "" "Utvrdi kodnu stranicu ovih datoteka: .html, .rc, .xml \n" "Treba ponovo pokrenuti program" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Standardna kodna stranica sistema" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Prema korisnikovom suèelju WinMerge-a" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Korisnièka kodna stranica:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - onemoguæen rad s arhivima" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nema 7-Zip programa (nije instaliran?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "Rad s arhivama zahtijeva program 7-Zip 3.11 ili njegovu noviju inaèicu instaliranu na raèunalu ili njegove bitne komponente za samostalno djelovanje, kopirane u mapi programa." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Nužan je odgovarajuæi dodatak (Merge7z*.dll) i staza do njega." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Molimo, koristite inaèice programa 7-Zip prema niže navedenom popisu, dok dodatak za novije inaèice ne bude dostupan." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Inaèica" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2064,54 +2071,54 @@ msgstr "" "Potreban dodatak\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Preporuèena inaèica programa 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "prisutan" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "Veži 7z000U.dll" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip sofver je instaliran na raèunalu:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "ništa" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "nedostaje" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip komponente za samostalno djelovanje:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "zastario" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Staza do dodataka:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2120,486 +2127,486 @@ msgstr "" "Ne prikazuj &više ovu poruku.\n" "(Uvijek je dostupna preko izbornika pomoæi.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Preuzimanje dodatka" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Postavke" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Skupina" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Uvoz..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Izvoz..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Kljuène rijeèi:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Nazivi funkcija:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Komentari:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Brojevi:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operatori:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Pojmovi:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Predobraðeno:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Korisnik 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Korisnik 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Podebljano" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Izvještaj usporedbe mapa" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "Datoteka izvještaja:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiraj u meðumemoriju" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Zajednièki ili osobni filtar" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Koji tip filtra želite stvoriti?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Zajednièki Filtar (za sve korisnike raèunala)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Osobni filtar (samo za trenutnog korisnika)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Rad s arhivima" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "7-Zip dodatak za instalaciju:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Preuzimanje 7-Zip dodatka" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "Omoguæi rad s &arhivima" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "Ko&risti vanjski 7-Zip ako je moguæe" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "&Koristi 7-Zip program kao unutarnji" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Oèitaj tip arhiva iz zaglavlja datoteke" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Usporedba statistike" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Mape:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Datoteke:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Razlika" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Tekst" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binarno:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Unikat" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Lijevo:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Desno:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identièno" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Ukupno:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Zatvori" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Djeluj" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Djeluj)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Odabir kodne stranice za" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&Uèitavanje datoteke:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "&Pohrana datoteke:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&Ista kodna stranica za obje" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "&Primjeni" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "Odustajem" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Test filtar" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Testiranje filtra..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Unos teksta za provjeru" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Naziv mape" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Zatvori" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&Koristi odabrane boje" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Korisnièke boje" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Skriveni znaci i praznine:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Pravilan tekst" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Odabir:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Staze" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Samo za èitanje" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Samo za èitanje" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Otvori..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Pohrani..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Sigurnost" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Pohrani rezervnu datoteku pri:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Pohrani rezervnu datoteku u:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "&Izvornu mapu datoteke" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "&Standardnu mapu rezervnih kopija" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Naziv rezervne datoteke" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "&Dodaj .bak ekstenziju" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "&Dodaj datum i vrijeme" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "Potvrdite kopiranje" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Kopirati XXX stavku?" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "S lijeva" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "U desno" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Da" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "Ne" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041a04e2" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Hasan Osmanagiæ" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x41a, 1250" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Spreman" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2608,7 +2615,7 @@ msgstr "" "Stvaranje prazne usporedbe\n" "Nova usporedba (Ctrl+O)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2617,7 +2624,7 @@ msgstr "" "Otvaranje postojeæe datoteke\n" "Otvori (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2626,7 +2633,7 @@ msgstr "" "Zatvaranje aktivne usporedbe\n" "Zatvori" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2635,7 +2642,7 @@ msgstr "" "Pohrana aktivne datoteke\n" "Pohrani (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2644,7 +2651,7 @@ msgstr "" "Pohrana aktivne datoteke pod novim nazivom\n" "Pohrani kao" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2653,7 +2660,7 @@ msgstr "" "Promjena postavki ispisa\n" "Postava stranice" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2662,7 +2669,7 @@ msgstr "" "Podešavanje postavki pisaèa i ispisa\n" "Postavke ispisa" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2671,7 +2678,7 @@ msgstr "" "Ispis aktivnog dokumenta\n" "Ispis" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2680,12 +2687,12 @@ msgstr "" "Prikaz stranice ispisa\n" "Pregled ispisa" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Ponovo prikaži sve skrivene stsvke" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2694,32 +2701,32 @@ msgstr "" "Otvaranje usporedbi\n" "Datoteka usporedbe (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Nepoznata greška pri otvaranju usporedbe" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Nepoznata greška pri pohrani usporedbe" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Usporedba" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Usporedba je uèitana." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Usporedba je pohranjena." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2728,7 +2735,7 @@ msgstr "" "Pohrana staze i datoteke usporedbe\n" "Pohrani usporedbu" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2737,7 +2744,7 @@ msgstr "" "Prikaz informacija o programu, br. inaèice i autorstva\n" "O" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2746,9 +2753,6 @@ msgstr "" "Zatvaranje programa; Podsjetnik za pohranu rada\n" "Izlaz" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2762,11 +2766,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Otvori ovu datoteku" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2775,7 +2782,7 @@ msgstr "" "Aktiviranje slijedeæeg panela\n" "Slijedeæi panel" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2784,7 +2791,7 @@ msgstr "" "Vraæanje na prethodni panel\n" "Prethodni panel" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2793,7 +2800,7 @@ msgstr "" "Otvaranje dokumenta u drugom panelu\n" "Novi panel" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2802,7 +2809,7 @@ msgstr "" "Sortiranje ikona podnožja panela\n" "Sortiraj ikone" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2811,7 +2818,7 @@ msgstr "" "Sortiranje okna kaskadno\n" "Kaskadno" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2820,7 +2827,7 @@ msgstr "" "Postavljanje okna vodoravno, bez prekrivanja\n" "Okna vodoravno" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2829,7 +2836,7 @@ msgstr "" "Postavljanje okna okomito, bez prekrivanja\n" "Okna okomito" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2838,7 +2845,7 @@ msgstr "" "Podijela aktivnog okna u panele\n" "Podijeli" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2847,7 +2854,7 @@ msgstr "" "Brisanje oznaèenog\n" "Obriši" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2856,7 +2863,7 @@ msgstr "" "Brisanje svega\n" "Obriši sve" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2865,7 +2872,7 @@ msgstr "" "Kopiranje sadržaja meðumemorije\n" "Kopiraj" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2874,7 +2881,7 @@ msgstr "" "Uklanjanje oznaèenog u meðumemoriju\n" "Odreži" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2883,7 +2890,7 @@ msgstr "" "Traženje odreðenog pojma\n" "Traži" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2892,7 +2899,7 @@ msgstr "" "Umetanje sadržaja meðumemorije\n" "Zalijepi" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2901,7 +2908,7 @@ msgstr "" "Ponavljanje zadnje radnje\n" "Ponovi" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2910,7 +2917,7 @@ msgstr "" "Zamjena odreðenog teksta drugim\n" "Zamijeni" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2919,7 +2926,7 @@ msgstr "" "Oznaèavanje cijelog dokumenta\n" "Oznaèi sve" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2928,7 +2935,7 @@ msgstr "" "Poništenje zadnje radnje\n" "Poništi (Ctrl+Z)" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2937,7 +2944,7 @@ msgstr "" "Povratak prethodnog stanja\n" "Vrati (Ctrl+Y)" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2946,7 +2953,7 @@ msgstr "" "Prikaz ili skrivanje trake alata\n" "Traka alata" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2955,7 +2962,7 @@ msgstr "" "Prikaz ili skrivanje trake statusa\n" "Traka statusa" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2964,7 +2971,7 @@ msgstr "" "Prikaz ili skrivanje trake oznaka\n" "Traka oznaka" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "" "Automatically resize panes\n" @@ -2973,57 +2980,57 @@ msgstr "" "Automatska prilagodba velièine panela\n" "Zakljuèaj panele" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Promjena velièine okna" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Promjena položaja okna" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Smanji okno na ikonu" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Poveæaj preko cijelog zaslona" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Okno slijedeæe usporedbe" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Okno prethodne usporedbe" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zatvori aktivno okno i podsjeti na pohranu dokumenta" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Vraæanje na uobièajenu velièinu okna" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Popis aktivnih zadataka" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Aktiviraj ovo okno" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3032,7 +3039,7 @@ msgstr "" "Zatvaranje pregleda ispisa\n" "Zatvori pregled" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3051,23 +3058,23 @@ msgstr "" "WinMerge. Dokument\n" "WinMerge dokument" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Zadrži izvorne znake kraja retka" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Pritisnite bilo koju tipku" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Desni klik na stazu koju trba kopirati" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3076,152 +3083,152 @@ msgstr "" "Autorski udio:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 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:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&U redu" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Prekini" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Ponovi" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Zanemari" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Zanemari &sve" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Da za &sve" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Ne za s&ve" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Nastavi" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Izostavi" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Izostavi &sve" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Ne prikazuj više ovu poruku." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Ne &pitaj ponovo." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Boja sintakse" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Boja teksta" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Programi" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "S lijeva:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "U lijevo:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "S desna:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "U desno:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "inaèica %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Postavke" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Ponovni prikaz svih poruka" -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Promjene su izvršene u aktivnoj datoteci kroz usporedbu. Neka podešavanja su vidljiva tek nakon ponovnog pokretanja usporedbe." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Promjene fonta nije vidljiva u aktivnim vidljivim oknima." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3232,7 +3239,7 @@ msgstr "" "\n" "Molimo koristite vrijednosti 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3243,107 +3250,107 @@ msgstr "" "\n" "Molimo, ponovo pokrenite WinMerge nakon povrata." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Otvori" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programi |*.exe;*.bat;*.cmd|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Sve datoteke (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge datoteke (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "INI datoteke (*.ini)|*.ini|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML datoteke (*.xml)|*.xml|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Potpun sadržaj" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Skraæeni sadržaj" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Datum promjene" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Datum promjene i velièina" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Velièina" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Naziv" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Položaj" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtri..." -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Izaberite datoteku kao novi filtar" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "FLT datoteke (*.flt)|*.flt|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3356,7 +3363,7 @@ msgstr "" "Molimo, kopirajte datoteku %1 u WinMerge/Filters -mapu:\n" "%2." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3369,7 +3376,7 @@ msgstr "" "\n" "Provjerite postoji li mapa i njenu dostupnost." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3380,7 +3387,7 @@ msgstr "" "\n" "Molimo, odredite ju u 'Postavke/Sistem'." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3393,12 +3400,12 @@ msgstr "" "\n" "Možda je zaštiæena - samo za èitanje?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Lociraj datoteku filtriracije za instalaciju" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3409,208 +3416,208 @@ msgstr "" "\n" "Ne mogu je pohraniti u mapu filtara." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filtar veæ postoji. Natpisati ga?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Algoritam" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Staza do cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Staza do SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Rezultati usporedbe mapa" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Usporedba datoteka" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Neimenovan" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Neimenovan" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Pretraživanje datoteka..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Otvaranje odabranog" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Kopiranje lijevo u desno" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Kopiranje desno u lijevo" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Kopiranje sve u lijevo" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Kopiranje sve u desno" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Kopiranje datoteka..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Brisanje datoteka..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Premještanje datoteka..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Stvaranje izvještaja..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Redak: %s Br: %d/%d Znak: %d/%d kraj: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Redak: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Redak: %s Br: %d/%d Znak: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Vezano" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Razlika: %1 od %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "Naðeno razlika: %1" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "Naðeno razlika: 1" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Stavka %1 od %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Stavke: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Odaberite dvije datoteke ili mape za usporedbu" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Izbor mape" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Izbor dviju datoteka ili mapa za usporedbu." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Lijeva staza je kriva!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Desna staza je kriva!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Obje staze su krive!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Molim izaberite dvije datoteke koje prihvaæa arhiver." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne mogu usporediti datoteku i mapu." -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Nema datoteke: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka nije raspakirana: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3623,7 +3630,7 @@ msgstr "" "\n" "su identiène binarne datoteke." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3636,7 +3643,7 @@ msgstr "" "\n" "su razlièite binarne datoteke." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3647,7 +3654,7 @@ msgstr "" "\n" "je binarna datoteka. Ne mogu se usporeðivati binarne i tekst datoteke." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3660,37 +3667,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Pohrani kao" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Pohraniti izmjene %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Greška pri kontroli moguænosti pohrane na odredištu" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Greška pri stvaranju rezervne datoteke" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3703,7 +3710,7 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3720,7 +3727,7 @@ msgstr "" "\t- Pritisnite 'U redu' za pohranu pod drugim nazivom\n" "\t- ili pritisnite 'Odustajem' za prekid postupka." -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3735,7 +3742,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3750,7 +3757,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3765,7 +3772,7 @@ msgstr "" "\n" "Natpisati datoteku?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3774,7 +3781,7 @@ msgstr "" "%1\n" "je oznaèena samo za èitanje. Natpisati zaštiæenu stavku?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3789,17 +3796,17 @@ msgstr "" "\n" "Ako želite osvježiti datoteku, zatvorite usporedbu i ponovite." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Pohrani lijevu datoteku kao" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Pohrani desnu datoteku kao" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3810,42 +3817,42 @@ msgstr "" "\n" "Osvježite dokumente prije nastavka." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Provjera datoteka na VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Greška pri izvršenju sistemske naredbe." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Nema VSS baze" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Greška iz VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3856,7 +3863,7 @@ msgstr "" " Molimo pregledajte podešenost korištenog izgleda. .\n" " Odustati?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3865,179 +3872,179 @@ msgstr "" "Versioning Sistem pokazuje grešku dok pokušava provjeriti datoteku.\n" " Molimo pregledajte podešenost korištenog izgleda. " -#: Merge.rc:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Ništa" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 i viši)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i viši)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Stani na praznini" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Stani na praznini ili interpunkciji" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiraj odabranu stavku u imenovanu mapu" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiraj odabranu stavku u korisnikovu mapu" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Obriši odabranu stavku s lijeva" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Obriši odabranu stavku s desna" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Obriši odabranu stavku na obje strane" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Sakrij odabranu(e) stavku(e) (filtar u letu)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Preimenuj odabranu stavku na obje strane" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Desno do lijevo (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Lijevo do desno (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Desno do lijevo (%1 od %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lijevo do desno (%1 od %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Lijevo do... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Desno do... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lijevo do... (%1 od %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Desno do... (%1 od %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Lijevo (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Desno (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Oba panela (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Lijevo (%1 od %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Desno (%1 od %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Oba panela (%1 od %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Odaberite odredišnu mapu:" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Lijeva strana - odaberite odredišnu mapu:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Desna strana - odaberite odredišnu mapu:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 datoteka doraðeno)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 od %2 datoteka doraðeno)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Kopirati sve razlike u lijevu datoteku?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Kopirati sve razlike u desnu datoteku" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4052,17 +4059,17 @@ msgstr "" "u\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Kopirati %1 od %2 odabranu(ih) stavku(i)?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Izbrisati %1 od %2 odabranu(ih) stavku(i)?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4073,7 +4080,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4084,17 +4091,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Kopirati:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Kopirati %d stavku:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4113,458 +4120,458 @@ msgstr "" "\n" "Osvježite usporedbu." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Otvori lijevu datoteku" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Otvori lijevu datoteku u vanjskom editoru" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Otvori sijevu datoteku s..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Otvori desnu datoteku" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Otvori desnu datoteku u vanjskom editoru" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Otvori desnu datoteku s..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Greška pri pokretanju vanjskog editora: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Nepoznat tip datoteke za vanjski editor: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiraj nazive datoteka u meðumemoriju" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiraj stazu lijeve strane u meðumemoriju" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiraj stazu desne strane u meðumemoriju" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiraj staze obiju strana u meðumemoriju" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Nepoznat oblik arhiva" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Dodaj stavke s lijeva u arhiv" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Dodaj stavke s desna u arhiv" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Dodaj stavke obiju strana u arhiv" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Dodaj stavke razlika u arhiv (obje strane)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Premještaj oznaèene datoteke s lijeva u izabranu mapu" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Premještaj oznaèene datoteke s desna u izabranu mapu" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Naziv datoteke" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Mapa" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Rezultat usporedbe" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Datum lijevo" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Datum sadašnji" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Tip" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Velièina lijevo" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Velièina desno" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Velièina desno (skraæeno)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Velièina lijevo (skraæeno)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Tim lijeve datoteke" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Tim desne datoteke" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Novija datoteka" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Verzija lijeve datoteke" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Verzija desne datoteke" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Rezultat skraæeno" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Atributi lijevo" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Atributi desno" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Završetak reda lijevo" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Završetak retka desne datoteke." -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Kodiranje lijevo" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Kodiranje desno" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Zanemari razlike" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Razlike" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binarno" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Ne mogu usporediti datoteke" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Odbaèena stavka" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Izostavljene datoteke" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Izostavljene mape" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Samo lijevi: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Samo desni: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Binarne datoteke su identiène" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Binarne datoteke su razlièite" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Datoteke su razlièite" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Samo lijevo" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Samo desno" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "Greška" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Proteklo vrijeme: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 stavka oznaèena" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 stavki oznaèeno" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Naziv datoteke ili mape." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazivi podmapa ako su podmape ukljuèene." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Rezultat usporedbe, duži oblik." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Lijeva strana - datum promjene." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Desna strana - datum promjene." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Tip (ekstenzija) datoteke" -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Velièina u bajtima, lijeve datoteke." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Velièina u bajtima, desne datoteke." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Skraæenice lijeve datoteke" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Skraæenice desne datoteke" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Lijeva strana - vrijeme stvaranja." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Desna strana - vrijeme stvaranja." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Koja strana je promijenjena ranije?" -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzija na lijevoj strani, samo za neke tipove." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzija na desnoj strani, samo za neke tipove." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Rezultat usporedbe, kraæi oblik." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Atributi lijeve datoteke" -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Atributi desne strane" -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Naèin završetka retka lijeve datoteke." -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Naèin završetka retka desne datoteke." -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Kodirana lijeva strana" -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Kodiranje desne strane" -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikaži zvjezdicu (*) uz binarnu datoteku." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Usporedi %1 s %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Popis odvojen zarezom" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Popis odvojen tabulatorom" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "Jednostavni HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "Jednostavni HTML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Datoteka izvještaja veæ postoji. Natpisati?" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4573,47 +4580,47 @@ msgstr "" "Greška pri stvaranju izvještaja:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Izvještaj je uspješno stvoren." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Ista datoteka je otvorena u oba panela." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Datoteke su identiène." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Odabrana mapa se ne može usporediti jer je veæ otvorena u drugom panelu." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Greška pri usporedbi datoteka." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Binarne datoteke se ne mogu vizualno usporeðivati." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Mapa datoteka se ne može vizualno usporeðivati." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4628,7 +4635,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4639,22 +4646,22 @@ msgstr "" " Prema postavkama, promijenit æe se kako je odabrano.\n" " Izmijeniti ovu postavku i zadržati razlièit naèin završetaka?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Greška prilikom prediffing datoteke '%1' s dodatkom '%2'. Prediffing se dalje ne izvodi." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Odabrana mapa je pogrešna." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne mogu otvoriti binarnu datoteku u ureðivaèu" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4665,132 +4672,132 @@ 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 namještenoj kodnoj stranici?" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Pažnja: Datoteke su kodirane razlièito, lijeva=%s, a desna=%s, i spajanje može prouzroèiti gubitak informacija." -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Greškom pri kodiranju izgubljena je informacija: obje datoteke" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Greškom pri kodiranju izgubljena je informacija: desna datoteka" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Greškom pri kodiranju izgubljena je informacija: lijeva datoteka" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Nema razlike" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Razlièiti redak" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamijenjeno %1 pojam (pojmova)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ne mogu naæi pojam \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Kopiraj stazu" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Kopiraj naziv datoteke" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Položal panela" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Panel razlika" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Datoteka razlika je pohranjena" -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. stavka ili mapa ne postoji!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. stavka ili mapa ne postoji!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Datoteka razlika veæ postoji. Natpisati?" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 datoteka odabrano]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Uobièajeno" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Detaljnije" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Združeno" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Ne mogu pohraniti u datoteku" -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Dana staza ne odgovara: %1" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Odredite izlaznu datoteku" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ne mogu stvoriti datoteku razlika iz binarnih datoteka" -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne mogu stvoriti datoteku razlika iz mapa." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4801,17 +4808,17 @@ msgstr "" "\n" "Prije stvaranja datoteke razlika, sve datoteke trebaju biti pohranjene." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Mapa ne postoji" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Rezultati usporedbi mapa æe biti uklonjeni." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4822,7 +4829,7 @@ msgstr "" "Nema nužnih komponenata (7-zip i/ili Merge7z*.dll) .\n" "Pregledajte upute kako omoguæiti rad s arhivama." -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4831,7 +4838,7 @@ msgstr "" "\n" "Napomena: Integracija 7-Zip je onemoguæena u WinMerge postavkama." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4840,37 +4847,37 @@ msgstr "" "\n" "Napomena: Integrirani 7-Zip je ogranièen na samostalno djelovanje unutar WinMerge postavki." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Odabir datoteke za izoz" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Odabir datoteke za uvoz" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Uvoz postavki u datoteku" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Izvoz postavki u datoteku" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Greška pri uèitanju postavki" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Greška pri pohrani odabranih postavki." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4881,1098 +4888,1098 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Greška u algoritmu" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Nema" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Krivi algoritam" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Krivi znak" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Krivi znak naziva klase" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Znak \"\"" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Kriva referenca" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Neodgovarajuæe [ or [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Neodgovarajuæe ( or \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Neodgovarajuæe" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Krivi sadržaj \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Krivi kraj raspona" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Izvan memorije" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Neoèekivan kraj algoritma" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Prerani kraj algoritma" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Dani algoritma je prevelik" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Neodgovarajuæe ) ili \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Afrikaans" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanian" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabic (Saudi Arabian)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabic (Iraq)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabic (Egyptian)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabic (Libyan)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabic (Algerian)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabic (Moroccan)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabic (Tunisian)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabic (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabic (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabic (Syrian)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabic (Jordan)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabic (Lebanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabic (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabic (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabic (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabic (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armenian" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azeri (Latin)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azeri (Cyrillic)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Basque" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Belarusian" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgarian" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalan" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chinese (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chinese (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chinese (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Hrvatski" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Czech" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Dansk" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Dutch" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Dutch (Belgium)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "English (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "English (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "English (Australian)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "English (Canadian)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Engleski (New Zealand)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "English (Irish)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "English (So. African)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "English (Jamaican)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "English (Caribbean)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "English (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "English (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "English (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "English (Philippines)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Eesti" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Faeroese" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Farsi" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Suomi" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "French" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "French (Belgique)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "French (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "French (Switzerland)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "French (Luxembourg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "French (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgian" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "German (Germany)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "German (Switzerland)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "German (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "German (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "German (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Greek" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebrew" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Hindi" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Hungarian" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Icelandic" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesian" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italian" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italian (Swiss)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japanese" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmiri (India)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Kazakh" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Korean" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Korean (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Latvian" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lithuanian" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malay (Malaysian)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malay (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "Manipuri" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norwegian (Bokml)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norwegian (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polski" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugese" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugese (Brazil)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Romanian" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russian" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sanskrit" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbian (Latin)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbian (Cyrillic)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "Sindhi" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Slovak" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Slovenian" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Spanish" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Spanish (Mexican)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Spanish (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Spanish (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Spanish (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Spanish (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Spanish (Dominican)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Spanish (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Spanish (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Spanish (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Spanish (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Spanish (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Spanish (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Spanish (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Spanish (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Spanish (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Spanish (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Spanish (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Spanish (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Spanish (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Kenya)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Swedish" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Swedish (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tamil" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatar (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Thai" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turkish" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ukranian" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "Urdu (Pakistan)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (India)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbek (Latin)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbek (Cyrillic)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamese" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Western European" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Eastern European" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "East Asian" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Middle Eastern" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Nije primjenjivo" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "Macintosh" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Aproksimacija ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Aproksimacija ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Aproksimacija ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Aproksimacija ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Aproksimacija ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Pohrani lijevu datoteku" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Pohrani desnu datoteku" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Pohrani lijevu datoteku pod nazivom..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Pohrani desnu datoteku pod nazivom..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Izmjena atributa, samo za èitanje, lijeve dat./mape" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Izmjena atributa, samo za èitanje, desna dat./mape" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Pretvori EOL u DOS naèin" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Pretvori EOL u UNIX naèin" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Pretvori EOL u MAC naèin" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Naèina rada: Ureðivanje - Vezano" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5981,12 +5988,12 @@ msgstr "" "Prikaz i podešavanje moguænosti kodiranja datoteka\n" "Moguænosti kodiranja" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5995,7 +6002,7 @@ msgstr "" "Isticanje razlike u aktivnom retku\n" "Razlike u aktivnom retku" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6004,7 +6011,7 @@ msgstr "" "Idi na redak razlike\n" "Idi na (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6013,7 +6020,7 @@ msgstr "" "Postavke programa\n" "Postavke " -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6022,37 +6029,37 @@ msgstr "" "Osvježavanje prikaza\n" "Osvježi (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiraj redak u meðumemoriju s brojem retka na poèetku" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Osvježi odabranu stavku" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Zamijeni oznake" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Slijedeæa oznaka" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Prethodna oznaka" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Ukloni sve oznake" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6061,7 +6068,7 @@ msgstr "" "Prikaz jednakih stavki\n" "Identiène stavke" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6070,7 +6077,7 @@ msgstr "" "Prikazivanje stavki koje se razlikuju\n" "Prikaz razlièitih stavki" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6079,7 +6086,7 @@ msgstr "" "Prikaz jedinih stavki razlika lijeve strane\n" "Lijevi unikati" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6088,7 +6095,7 @@ msgstr "" "Prikaz jedinih stavki raznika desne strane\n" "Desni unikati" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6097,7 +6104,7 @@ msgstr "" "Prikazivanje binarnih datoteka\n" "Prikaz binarnih datoteka" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6106,7 +6113,7 @@ msgstr "" "Prikazivanje zanemarenih stavki\n" "Prikaz zanemarenih stavki" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6115,7 +6122,7 @@ msgstr "" "Odabir fonta\n" "Odabir fonta" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6124,27 +6131,27 @@ msgstr "" "Vraæanje na prednamješteni font za pregledanje\n" "Standardni font" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Skriveni znaci i praznine" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Zamjeni panele" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Panel prikazuje položaj razlike u datoteci" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Prikaži okno statistike usporedbe mapa" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6153,7 +6160,7 @@ msgstr "" "Izaberite vaš jezik\n" "Jezik" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6162,12 +6169,12 @@ msgstr "" "Isticanje bojanjem razlika u recima\n" "Oboji razlièite retke" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Meðusobno zamijeni položaje panela" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6176,7 +6183,7 @@ msgstr "" "Prikaz brojeva redaka\n" "Prikaži brojeva redaka" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6185,7 +6192,7 @@ msgstr "" "Omoguæavanje prijeloma teksta\n" "Prijelom teksta" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6194,17 +6201,17 @@ msgstr "" "Prikaz odabranih margina za oba panela\n" "Prikaz odabranih margina" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6213,7 +6220,7 @@ msgstr "" "Prikaz prethodne razlike\n" "Prethodna razlika (Alt+Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6222,7 +6229,7 @@ msgstr "" "Prikaz slijedeæe razlike\n" "Slijedeæa razlika (Alt+Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6231,7 +6238,7 @@ msgstr "" "Prikaz prve razlike\n" "Prva razlika (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6240,7 +6247,7 @@ msgstr "" "Prikaz aktivne razlike\n" "Aktivna razlika (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6249,7 +6256,7 @@ msgstr "" "Posljednja razlika\n" "Posljednja razlika (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6258,7 +6265,7 @@ msgstr "" "Kopiranje oznaèenog teksta u desnu datoteku\n" "Kopiraj u desno (Alt+desno)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6267,7 +6274,7 @@ msgstr "" "Kopiranje oznaèenog teksta u lijevu datoteku\n" "Kopiraj u lijevo (Alt+lijevo)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6276,7 +6283,7 @@ msgstr "" "Kopiraj razliku u desno i idi na slijedeæu\n" "Kopiraj u desno i dalje (Ctrl+Alt+desno)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6285,7 +6292,7 @@ msgstr "" "Kopiraj razliku u lijevo i idi na slijedeæu\n" "Kopiraj u lijevo i dalje (Ctrl+Alt+lijevo)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6294,7 +6301,7 @@ msgstr "" "Kopiranje svih razlika u desno\n" "Sve u desno" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6303,72 +6310,72 @@ msgstr "" "Kopiranje svih razlika u lijevo\n" "Sve u lijevo" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Obriši odabrane stavke iz obje mape." -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Usporedba odabranih stavki (U višestrukom izboru, usporeðuje se prva)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Selektiranje i razmještaj mape prema usporedbi kolona" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Stvaranje datoteku razlika " -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Odaberi sve filtre za promjene" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Stvaranje izvještaja iz usporedbe" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Korisnik bira arhiver (ne djeluje na mapama)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Odaberite arhiver za ovaj arhiv." -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Nema prediffer (uobièajeno)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Preporuèljivi dodaci" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Ostali dodaci" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Ponovo uèitaj sve dodatke (za znalce)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6377,12 +6384,12 @@ msgstr "" "Aktiviranje slijedeæe datoteke - vidljiva\n" "Aktiviraj slijedeæu datoteke" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Zatvori sve panele" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6391,22 +6398,22 @@ msgstr "" "Prkaz WinMerge pomoæi\n" "Pomoæ" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Pohrana WinMerge informacija o inaèici i podešenosti u tekstt datoteku" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "GNU javna licenca" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Osobni uradak: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6415,7 +6422,7 @@ msgstr "" "Prkaz WinMerge sadržaja pomoæi\n" "Sadržaj pomoæi" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6424,267 +6431,272 @@ msgstr "" "Prikaz WinMerge pretraživanja pomoæi\n" "Pretraživanje pomoæi" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Postavke dodataka" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Bez prediffer" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Prediff ako je moguæe" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH dodatak nije naðen! - .sct skripte su onemoguæene" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "Ništa" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "Automatski" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Otvori datoteku u pridruženom ureðivaèu" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Otvori datoteku u vanjskom ureðivaèu" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Otvori datoteku u odreðenom ureðivaèu" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Ne prikazuj premještene blokove" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Prikaz svih premještanja, crno" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Prikaži premještene blokove samo aktivnih razlika" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Idi na razliku pod kursorom" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Idi &na razliku %1 od %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "Idi &na redak" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Onemoguæeno" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Sistem datoteka" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Popis zadnje korištenih" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "Resursi" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Sakrij alatnu traku" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Male ikone alatne trake" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Velike ikone alatne trake" diff --git a/Src/Languages/Czech.po b/Src/Languages/Czech.po index ef99a1900..9687a1f86 100644 --- a/Src/Languages/Czech.po +++ b/Src/Languages/Czech.po @@ -72,7 +72,7 @@ msgstr "Vyj&mout" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Kopírovat" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "&Vložit" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "Pø&ejít na..." @@ -95,43 +95,43 @@ msgid "Op&en" msgstr "&Otevøít" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "pøidruženou &aplikací" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "externím &editorem" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&zvolit..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Soubor" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Nové\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Otevøít...\tCtrl+O" @@ -147,8 +147,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Otevøít pro&jekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Uložit &projekt..." @@ -159,1847 +159,1854 @@ msgid "Recent Projects" msgstr "Naposledy použité" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Konec" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "Úpr&avy" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "Možnost&i..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Zobrazit" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Vybrat písmo..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Použít výchozí písmo" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "Panel &nástrojù" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "&Skrýt" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "&Malý" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Velký" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "&Stavový øádek" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "Panel &záložek" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Jazyk..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Nástroje" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtry..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Opravný soubor..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Pluginy" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "Pøevádìt &ruènì" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "Pøevádìt &automaticky" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Upravit pomocí pøevadìèe" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "Znovu &naèíst" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Okno" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Zavøít" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Z&avøít vše" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Z&mìnit panel\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Vedle sebe &vodorovnì" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Vedle sebe &svisle" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Na sebe" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "Nápo&vìda" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Obsah...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Rejstøík..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Hledat..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "&Nastavení..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "&Podpora archivace vypnuta..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "Veøejná licence &GNU..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "O &aplikaci WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Otevøít pro&jekt...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "L&evý pouze pro ètení" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Pr&avý pouze pro ètení" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "Kó&dování souborù" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vybr&at vše\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Ukázat s&hodné položky" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Ukázat roz&dílné položky" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Ukázat &levé jedineèné položky" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Ukázat p&ravé jedineèné položky" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Ukázat pø&eskoèené položky" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Ukázat &binární soubory" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Ukázat s&kryté položky" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "St&atistika porovnání" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Obnovit\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Obnovit &vybrané\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "Slo&uèit" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Porov&nat\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Další rozdíl\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Pøedchozí rozdíl\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Pr&vní rozdíl\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Ak&tuální rozdíl\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Po&slední rozdíl\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopírovat dop&rava\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopírovat do&leva\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "Odstran&it\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "Vlastní &sloupce..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "&Protokol porovnání..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Uložit\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Uložit &levý" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Uložit" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Uložit j&ako..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Uložit p&ravý" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Tisk..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "V&zhled stránky" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "Ná&hled..." -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "Pøevést konce øá&dkù" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Režim sl&uèování\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Zpìt\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Znov&u\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Vyj&mout\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopírovat\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Vložit\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Vybrat roz&díl v øádku\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Najít...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Na&hradit...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "Skrip&ty" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< žádné >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "&Rozšíøené" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopírovat s èísly øádkù\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "Zá&ložky" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Pøepnout &záložku\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Další záložka\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Pøedchozí záložka\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "Zrušit &všechny záložky" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Pø&ejít na...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Zvýraznìní syntaxe" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Zobrazit ne&tisknutelné znaky" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Zobrazit rozdíly v øá&dcích" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Zobrazit èísla øád&kù" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Zobrazit &levé okraje" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "Zala&movat øádky" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "Z&amìnit panely" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "&Rozdílový panel" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "&Polohový panel" -#: Merge.rc:428 +#: Merge.rc:430 #, 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:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopírovat dol&eva a na další\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "&Kopírovat vše doprava" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "K&opírovat vše doleva" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "&Porovnat" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&Levé doprava" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "L&evé do..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "P&ravé doleva" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "Pr&avé do..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "Pø&esunout" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Levé do..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "P&ravé do..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "Odstran&it" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Levé" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "P&ravé" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "O&boje" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "Pøej&menovat" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "&Skrýt položky" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "Otevøít &levé" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Otevøít p&ravé" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Kopírovat &umístìní souborù" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Levé (%1 z %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "P&ravé (%1 z %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "O&boje (%1 z %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Kopírovat &název souboru" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "&Archivovat" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Levé... (%1 z %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "P&ravé... (%1 z %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "O&boje... (%1 z %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Ro&zdíly... (%1 z %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "&Obnovit" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "Kopírovat celé &umístìní" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Kopírovat &název souboru" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "&Pøejít na øádek" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Nezobrazovat pøesunuté bloky" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Všechny pøesunuté bloky" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Pøesunutý blok pro ak&tuální rozdíl" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "O aplikaci WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Všechna práva vyhrazena." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Navštivte domovskou stránku WinMerge!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Pøispìvatelé" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Vybrat soubory nebo složky..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "V&levo:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Procházet..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "Vp&ravo:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "Pr&ocházet..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Filtr:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "&Vybrat..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "Pø&evadìè:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Vy&brat..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "Vèetnì pod&složek" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Storno" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Nápovìda" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Soubory nebo složky k porovnání" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Systém sledování verzí" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Systém sledování verzí:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Cesta k programu cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Obecné" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automaticky posunout na pr&vní rozdíl" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "Nezobrazovat úvodní o&brazovku" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zavírat okna klávesou &Esc" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automaticky &ovìøovat cesty v dialogu Otevøít" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "Povolit pouze jedno &hlavní okno aplikace" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "Dotázat se na &zavøení více oken" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Automatické &dokonèování:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Povolit více oken pro porovnání" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "s&ložek" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "&souborù" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "V&rátit" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Jazyk" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Dostupné jazyky:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Najít" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "C&o hledat:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Pouze &celá slova" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "&Rozlišovat malá a velká písmena" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "R&egulérní výraz" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "Zastavit na &konci souboru" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Smìr" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "Nahor&u" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "&Dolù" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Najít další" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Nahradit" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Èí&m nahradit:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "Zastavit na &konci souboru" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Nahrazovat" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "ve vý&bìru" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "v ce&lém souboru" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "Na&hradit" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Nahradit &vše" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Komentáøe" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Filtrování øádkù" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Povolit filtrování øádkù" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulérní výrazy (jeden na øádek):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "&Uložit" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "&Nový" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Upr&avit" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "O&dstranit" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Barvy" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Rozdíl:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Vybraný rozdíl:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Pozadí" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Chybìjící" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Ignorovaný rozdíl:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Pøesunutý blok:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Vybraný pøesunutý blok:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Rozdílné slovo:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Vybrané rozdílné slovo:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "&Pùvodní" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Syntaxe" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Systém" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Odeslat odstranìné soubory do &koše" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "&Ignorovat èasové rozdíly menší než 3 sekundy" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integrace" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "Pøidat do &místní nabídky v prùzkumníku" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Povolit &rozšíøenou nabídku" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "Výchozí porovnání vèetnì pod&složek" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Externí editor:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "Složka vlastních &filtrù:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Pr&ocházet..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Vytvoøení opravného souboru" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Soubor &1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Soubor &2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Procházet..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "Z&amìnit" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "Pø&ipojit ke stávajícímu souboru" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "Vý&sledek:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "Formát" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "Me&toda:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "O&bsah:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Prázdná místa" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "P&orovnávat" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Ignorovat &zmìny" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Ignorovat &všechny" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorovat prázdné øá&dky" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Rozlišovat &malá a velká písmena" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Vložit pøí&kazový øádek" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Otevøít v &externím editoru" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Zobrazit sloupce" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Zvolit pøevadìè" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "&Pøevadìè souborù:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "&Zobrazit všechny pøevadìèe (nekontrolovat podle pøípony)" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Seznam pøípon:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Popis:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr " Prùbìh porovnání složek" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Zastavit" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Porovnávají se položky..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Porovnáno:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Celkem:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Pøejít" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "Pøejít &na:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Soubor" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Pøejít na co" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "Øá&dek" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "Ro&zdíl" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Pøejít" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Porovnávání" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Prázdná místa" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "P&orovnávat" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "Ignorovat &zmìny" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Ignorovat &všechny" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorovat prázdné øá&dky" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignorovat &malá a velká písmena" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Ignorovat rozdíly v &koncích øádkù (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Povolit zjišování pøesunutých &blokù" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "Za&rovnat podobné øádky" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Zpùsob porovnání &souborù:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "Zastavit po prvním &rozdílu" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Filtrovat kom&entáøe" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Zvýraznit sy&ntaxi" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Automaticky &opìtovnì porovnávat" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "Zachovat pùvodní znaky na &koncích øádkù" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabelátory" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Velikost:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "Vkládat &tabelátory" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Vkládat &mezery" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Obarvit rozdíly v øádku" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Zobrazit rozdíly v øá&dku" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "Na úrovni &znakù" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "Na úrovni &slov:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filtrování souborù" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Z&kouška" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "&Instalovat..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "&Nový..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "&Upravit..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "O&dstranit..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Uložit zmìnìné soubory?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Soubor na levé stranì" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "Ulož&it zmìny" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Zrušit zmìny" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Soubor na pravé stranì" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "Ul&ožit zmìny" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Zr&ušit zmìny" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Zrušit &vše" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Kódování" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Výchozí kódování" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2008,56 +2015,56 @@ 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:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "&Systémové kódování" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "&Podle uživatelského prostøedí WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "&Vlastní znaková stránka:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - podpora archivace vypnuta" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nelze zjistit verzi programu 7-Zip (není nainstalován?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "Podpora archivace vyžaduje, aby byl ve vašem poèítaèi nainstalován program 7-Zip verze 3.11 nebo novìjší, anebo aby jeho základní souèásti pro samostatné operace byly zkopírovány do adresáøe programu WinMerge." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "V tomto adresáøi také musí být pøíslušné pluginy rozhraní (Merge7z*.dll)." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Používejte prosím verze programu 7-Zip doporuèené níže, dokud nebudou dostupné pluginy rozhraní pro pozdìjší verze." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Verze" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2066,54 +2073,54 @@ msgstr "" "Vyžadovaný plugin\n" "(knihovna %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Doporuèená verze programu 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "pøítomná" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Program 7-Zip instalovaný ve vašem poèítaèi:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "není" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "chybí" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Souèásti 7-Zip pro samostatné operace:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "zastaralá" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Cesty pluginù:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2122,486 +2129,486 @@ msgstr "" "T&uto zprávu již pøíštì nezobrazovat.\n" "(Tuto zprávu mùžete vždy znovu vyvolat z nabídky Nápovìda.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Stáhnout pluginy" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Možnosti" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Kategorie" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "&Naèíst..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "&Uložit..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Klíèová slova:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Názvy funkcí:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Komentáøe:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Èísla:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operátory:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Øetìzce:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Preprocesor:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Uživatelská 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Uživatelská 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Tuèné" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Protokol o porovnání složek" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "&Soubor protokolu:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "Uložit jako &typ:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopírovat do schránky" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Typ filtru" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Jaký typ filtru chcete vytvoøit?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, 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:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Vlastní filtr (pouze pro souèasného uživatele)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Podpora archivace" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Podpora archivace vyžaduje nainstalované pluginy 7-Zip:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Stáhnout pluginy 7-Zip" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Zapnout podporu archivních souborù" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "Použít &samostatný program 7-Zip, pokud je dostupný" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "Použít &místní program 7-Zip z adresáøe WinMerge" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "Zjistit &automaticky typ archivu" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Statistika porovnání" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Složky:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Soubory:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Rozdílné" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Textové:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binární:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Jedineèné" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Vlevo:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Vpravo:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Shodné" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Celkem:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Zavøít" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Vliv" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(ovlivnìno)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Zvolte kódování pro" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&Naètení souboru:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "&Uložení souboru:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "Použít &stejnou znakovou stránku pro oba" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "P&oužít" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "Storno" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Zkouška filtru" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Zkouška filtru ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Vložte text ke zkoušce:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Název složky" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Výsledek:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "Z&kusit" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Zavøít" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "Po&užít vlastní barvy textu" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Vlastní barvy textu" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Okolí textu:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Øádný text:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Výbìr:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Cesty" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Pouze pro è&tení" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Pouze pro èt&ení" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "&Naèíst..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "&Uložit..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Zálohování souborù" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Vytváøet záložní soubory pro:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Umístìní záložních souborù:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "&Pùvodní složka souborù" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "&Jednotná záložní složka:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Název záložního souboru:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "Pøipojit pøíponu .&bak" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "Pøipojit è&asové razítko" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "Potvrdit kopírování" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Opravdu chcete zkopírovat XXX položek?" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "Zleva" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "Doprava" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Ano" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "Ne" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "040504e2" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Jan Hryz" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x405, 1250" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Pøipraven" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2610,7 +2617,7 @@ msgstr "" "Vytvoøí nové dokumenty\n" "Nové dokumenty (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2619,7 +2626,7 @@ msgstr "" "Otevøe existující dokument\n" "Otevøít (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2628,7 +2635,7 @@ msgstr "" "Zavøe aktivní dokument\n" "Zavøít" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2637,7 +2644,7 @@ msgstr "" "Uloží aktivní dokument\n" "Uložit (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2646,7 +2653,7 @@ msgstr "" "Uloží aktivní dokument pod novým názvem\n" "Uložit jako" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2655,7 +2662,7 @@ msgstr "" "Zmìní možnosti tisku\n" "Vzhled stránky" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2664,7 +2671,7 @@ msgstr "" "Zmìní možnosti tiskárny\n" "Nastavení tisku" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2673,7 +2680,7 @@ msgstr "" "Vytiskne aktivní dokument\n" "Tisk" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2682,12 +2689,12 @@ msgstr "" "Zobrazí celé stránky\n" "Náhled tisku" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Znovu zviditelní všechny skryté položky" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2696,32 +2703,32 @@ msgstr "" "Otevøe projekt ze souboru\n" "Otevøít projekt (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznámá chyba pøi pokusu o otevøení souboru projektu" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznámá chyba pøi pokusu o uložení souboru projektu" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Projekt" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Soubor s projektem byl úspìšnì naèten." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Soubor s projektem byl úspìšnì uložen." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2730,7 +2737,7 @@ msgstr "" "Uloží aktuální cesty a volby do souboru projektu\n" "Uložit projekt" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2739,7 +2746,7 @@ msgstr "" "Zobrazí informace o programu, èíslo verze a copyright\n" "O aplikaci" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2748,9 +2755,6 @@ msgstr "" "Ukonèí aplikaci; dotáže se na uložení dokumentù\n" "Konec" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2764,11 +2768,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Otevøe tento dokument" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2777,7 +2784,7 @@ msgstr "" "Pøepne do dalšího panelu v oknì\n" "Další panel" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2786,7 +2793,7 @@ msgstr "" "Pøepne do pøedchozího panelu v oknì\n" "Pøedchozí panel" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2795,7 +2802,7 @@ msgstr "" "Otevøe jiné okno pro aktivní dokument\n" "Nové okno" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2804,7 +2811,7 @@ msgstr "" "Seøadí ikony u dolního okraje okna\n" "Seøadit ikony" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2813,7 +2820,7 @@ msgstr "" "Uspoøádá okna tak, aby se pøekrývala\n" "Na sebe" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2822,7 +2829,7 @@ msgstr "" "Uspoøádá okna vodorovnì tak, aby se nepøekrývala\n" "Vedle sebe" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2831,7 +2838,7 @@ msgstr "" "Uspoøádá okna svisle tak, aby se nepøekrývala\n" "Vedle sebe" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2840,7 +2847,7 @@ msgstr "" "Rozdìlí aktivní okno do panelù\n" "Rozdìlit" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2849,7 +2856,7 @@ msgstr "" "Vymaže výbìr\n" "Vymazat" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2858,7 +2865,7 @@ msgstr "" "Vymaže všechno\n" "Vymazat vše" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2867,7 +2874,7 @@ msgstr "" "Zkopíruje výbìr a umístí jej do schránky\n" "Kopírovat" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2876,7 +2883,7 @@ msgstr "" "Vyjme výbìr a umístí jej do schránky\n" "Vyjmout" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2885,7 +2892,7 @@ msgstr "" "Najde zadaný text\n" "Najít" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2894,7 +2901,7 @@ msgstr "" "Vloží obsah schránky\n" "Vložit" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2903,7 +2910,7 @@ msgstr "" "Opakuje poslední akci\n" "Opakovat" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2912,7 +2919,7 @@ msgstr "" "Nahradí zadaný text jiným textem\n" "Nahradit" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2921,7 +2928,7 @@ msgstr "" "Vybere celý dokument\n" "Vybrat vše" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2930,7 +2937,7 @@ msgstr "" "Vrátí zpìt poslední akci\n" "Zpìt (Ctrl+Z)" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2939,7 +2946,7 @@ msgstr "" "Znovu provede pøedtím vrácenou akci\n" "Znovu (Ctrl+Y)" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2948,7 +2955,7 @@ msgstr "" "Zobrazí nebo skryje panel nástrojù\n" "Panel nástrojù" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2957,7 +2964,7 @@ msgstr "" "Zobrazí nebo skryje stavový øádek\n" "Stavový øádek" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2966,62 +2973,62 @@ msgstr "" "Zobrazí nebo skryje panel záložek\n" "Panel záložek" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Mìní velikost okna" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Mìní umístìní okna" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Zmenší okno do ikony" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Zvìtší okno na maximální velikost" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Pøepne do dalšího okna" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Pøepne do pøedchozího okna" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zavøe aktivní okno a dotáže se na uložení zmìn" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Obnoví normální velikost okna" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Vyvolat seznam úloh" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Aktivovat toto okno" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3030,7 +3037,7 @@ msgstr "" "Ukonèí režim náhledu tisku\n" "Zrušit náhled" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3042,175 +3049,175 @@ msgid "" "WinMerge Document" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Zachovat pùvodní znaky na koncích øádkù" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Stisknìte klávesu" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Stisknìte pravé tlaèítko myši k možnostem zkopírování cesty nebo názvu souboru" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Pøerušit" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Zkusit znovu" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignorovat" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "I&gnorovat vše" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Ano" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Ano &všem" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Ne vš&em" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "Pok&raèovat" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "Pøe&skoèit" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Pøes&koèit vše" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "T&uto zprávu již pøíštì nezobrazovat." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Na t&uto otázku se již pøíštì nedotazovat." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Zvýraznìní syntaxe" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Barvy textu" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Kontrola verzí" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "Zleva:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "Doleva:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "Zprava:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "Doprava:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Verze %1 - Èesky" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Možnosti (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, 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:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Úpravy pro aktuální porovnání souborù byly provedeny. K nìkterým nastavením nemusí dojít, dokud nebude souèasné porovnání souborù znovu provedeno." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Zmìna zvoleného písma nebude použita v žádném aktuálnì viditelném oknì porovnání." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3221,7 +3228,7 @@ msgstr "" "\n" "Použijte prosím hodnoty mezi 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3232,107 +3239,107 @@ msgstr "" "\n" "Po zmìnì nastavení prosím znovu spuste aplikaci WinMerge." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Otevøít" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Všechny soubory (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Všechny soubory (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Projekty WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Soubory nastavení (*.ini)|*.ini|Všechny soubory (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Soubory HTML (*.htm,*.html)|*.htm;*.html|Všechny soubory (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Soubory XML (*.xml)|*.xml|Všechny soubory (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Plný obsah" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Rychlý obsah" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Datum zmìny" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Datum zmìny a velikost" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Velikost" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Název" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Umístìní" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtry" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Popis" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Zvolte název souboru pro nový filtr" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtry (*.flt)|*.flt|Všechny soubory (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3345,7 +3352,7 @@ msgstr "" "Zkopírujte prosím soubor %1 do složky s filtry pro aplikaci WinMerge:\n" "%2." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3358,7 +3365,7 @@ msgstr "" "\n" "Ujistìte se prosím, že složka existuje a je možné do ní zapisovat." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3369,7 +3376,7 @@ msgstr "" "\n" "Zvolte prosím složku v dialogovém oknì Možnosti, v kategorii Systém." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3382,12 +3389,12 @@ msgstr "" "\n" "Možná je soubor oznaèen pouze pro ètení?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Vyhledat soubor s filtrem k instalaci" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3398,208 +3405,208 @@ msgstr "" "\n" "Nový soubor nelze zkopírovat do složky filtrù." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Soubor s filtrem již existuje. Chcete nahradit stávající filtr?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Regulérní výraz" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Cesta k programu cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Cesta k programu SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Výsledky porovnání složek" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Porovnání souborù" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Bez názvu vlevo" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Bez názvu vpravo" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Prohledávaní souborù..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Otevírání výbìru" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Kopírování zleva doprava" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Kopírování zprava doleva" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Kopírování všech doleva" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Kopírování všech doprava" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Kopírování souborù..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Odstranìní souborù..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Pøesouvání souborù..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Vytváøení protokolu..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Øádek: %s Sloupec: %d/%d Znak: %d/%d Konec øádku: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Øádek: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Øádek: %s Sloupec: %d/%d Znak: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Slouèit" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Rozdíl %1 z %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "Nalezeno %1 rozdílù" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "Nalezen 1 rozdíl" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "Pro ètení" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Položka %1 z %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Položek: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, 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:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Vybrat složku" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dvì složky nebo dva soubory k porovnání" -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Levá cesta je chybná!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Pravá cesta je chybná!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Obì cesty jsou chybné!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vyberte dva soubory k zpøístupnìní volby pøevadìèe" -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Nelze porovnat soubor a složku!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Soubor nebyl nalezen: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Soubor nebyl pøeveden: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3612,7 +3619,7 @@ msgstr "" "\n" "jsou shodné binární soubory." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3625,7 +3632,7 @@ msgstr "" "\n" "jsou rozdílné binární soubory." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3636,7 +3643,7 @@ msgstr "" "\n" "je binární soubor. Nelze porovnávat binární a textové soubory." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3649,37 +3656,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Uložit jako" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Uložit zmìny do %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Chyba pøi kontrole zapisovatelnosti do cíle" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Chyba pøi zálohování souboru" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3692,7 +3699,7 @@ msgstr "" "\n" "Chcete pokraèovat?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3709,7 +3716,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:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3724,7 +3731,7 @@ msgstr "" "\n" "Chcete uložit pøevedenou verzi do jiného souboru?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3739,7 +3746,7 @@ msgstr "" "\n" "Chcete uložit pøevedenou verzi do jiného souboru?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3754,7 +3761,7 @@ msgstr "" "\n" "Pøepsat zmìnìný soubor?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3763,7 +3770,7 @@ msgstr "" "%1\n" "je oznaèen pouze pro ètení. Chcete nahradit tuto položku?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3778,17 +3785,17 @@ msgstr "" "\n" "Pokud chcete soubory obnovit, zavøete aktuální porovnání a naètìte soubory znovu." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Uložit levý soubor jako" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Uložit pravý soubor jako" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3799,42 +3806,42 @@ msgstr "" "\n" "Pøed dalším pokraèováním dokumenty obnovte." -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2108 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2107 +#: Merge.rc:2110 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3842,186 +3849,186 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2114 #, 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Žádný" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (nižší než 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vyšší)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Pøerušit v mezerách" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Pøerušit v mezerách nebo v interpunkci" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Zkopíruje vybrané položky do uvedené složky" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Zkopíruje vybrané položky do vlastní složky" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Odstraní vybrané položky vlevo" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Odstraní vybrané položky vpravo" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Odstraní vybrané položky na obou stranách" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Doèasnì skryje vybrané položky" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Pøejmenuje vybrané položky na obou stranách" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "P&ravé doleva (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "&Levé doprava (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "P&ravé doleva (%1 z %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "&Levé doprava (%1 z %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "L&evé do... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Pr&avé do... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "L&evé do... (%1 z %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Pr&avé do... (%1 z %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "&Levé (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "P&ravé (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "O&boje (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "&Levé (%1 z %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "P&ravé (%1 z %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "O&boje (%1 z %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Zvolte cílovou složku" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Zvolte cílovou složku pro položky z levé strany:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Zvolte cílovou složku pro položky z pravé strany:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(ovlivnìno souborù: %1)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(ovlivnìno souborù: %1 z %2)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Opravdu chcete zkopírovat všechny rozdíly do souboru vlevo?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Opravdu chcete zkopírovat všechny rozdíly do souboru vpravo?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4036,17 +4043,17 @@ msgstr "" "do\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Opravdu chcete zkopírovat %1 z %2 vybraných položek?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Opravdu chcete odstranit %1 z %2 vybraných položek?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4057,7 +4064,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4068,17 +4075,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Opravdu chcete zkopírovat:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Opravdu chcete zkopírovat %d položek:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4097,458 +4104,458 @@ msgstr "" "\n" "Obnovte prosím porovnání." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Otevøe položku vlevo" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Otevøe soubor vlevo v externím editoru" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Otevøe soubor vlevo ve zvolené aplikaci" -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Otevøe položku vpravo" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Otevøe soubor vpravo v externím editoru" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Otevøe soubor vpravo ve zvolené aplikaci" -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nelze spustit externí editor: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Neznámé rozšíøení externího editoru: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Zkopíruje názvy položek do schránky" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Zkopíruje cesty položek vlevo do schránky" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Zkopíruje cesty položek vpravo do schránky" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Zkopíruje cesty položek na obou stranách do schránky" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Neznámý formát archivu" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Pøidá položky z levé strany do archivu" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Pøidá položky z pravé strany do archivu" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Pøidá položky z obou stran do archivu" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Pøidá rozdílné položky do archivu (z obou stran)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Pøesune vybrané položky z levé strany do vlastní složky" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Pøesune vybrané položky z pravé strany do vlastní složky" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Název souboru" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Složka" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Výsledek porovnání" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Datum vlevo" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Datum vpravo" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Pøípona" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Velikost vlevo" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Velikost vpravo" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Velikost vpravo (krátce)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Velikost vlevo (krátce)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Datum vytvoøení vlevo" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Datum vytvoøení vpravo" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Novìjší soubor" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Verze souboru vlevo" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Verze souboru vpravo" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Struèný výsledek" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Atributy vlevo" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Atributy vpravo" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Konce øádkù vlevo" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Konce øádkù vpravo" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Kódování vlevo" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Kódování vpravo" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Ignor. rozdílù" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Rozdílù" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binární" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Soubory nelze porovnat" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Pøerušeno" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Soubor pøeskoèen" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Složka pøeskoèena" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Pouze vlevo: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Pouze vpravo: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Binární soubory jsou shodné" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Binární soubory jsou rozdílné" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Soubory jsou rozdílné" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Pouze vlevo" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Pouze vpravo" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynulý èas: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "Vybrána 1 položka" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "Vybráno %1 položek" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Název souboru nebo složky" -#: Merge.rc:2284 +#: Merge.rc:2287 #, 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:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Výsledek porovnání, dlouhý popis" -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Datum zmìny souboru na levé stranì" -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Datum zmìny souboru na pravé stranì" -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Pøípona souboru" -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Velikost souboru na levé stranì v bytech" -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Velikost souboru na pravé stranì v bytech" -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Velikost souboru na levé stranì zkrácenì" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Velikost souboru na pravé stranì zkrácenì" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Datum vytvoøení souboru na levé stranì" -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Datum vytvoøení souboru na pravé stranì" -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Ukáže, na které stranì je novìjší datum zmìny" -#: Merge.rc:2301 +#: Merge.rc:2304 #, 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:2302 +#: Merge.rc:2305 #, 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:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Struèný výsledek porovnání" -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Atributy souboru na levé stranì" -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Atributy souboru na pravé stranì" -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Typ konce øádkù v souboru na levé stranì" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Typ konce øádkù v souboru na pravé stranì" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Kódování souboru na levé stranì" -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Kódování souboru na pravé stranì" -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ukáže hvìzdièku (*), pokud je soubor binární" -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Porovnání %1 s %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Seznam oddìlený èárkami" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Seznam oddìlený tabelátory" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "Soubor HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "Soubor XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4557,47 +4564,47 @@ msgstr "" "Chyba pøi vytváøení protokolu:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Protokol byl úspìšnì vytvoøen." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "V obou panelech je otevøen stejný soubor." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Vybrané soubory jsou shodné." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Vybraná složka existuje pouze na jedné stranì, proto ji nelze otevøít." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Bìhem porovnání souborù se vyskytla chyba." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Binární soubory nelze vizuálnì porovnat." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Složky nelze vizuálnì porovnat." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4612,7 +4619,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4623,22 +4630,22 @@ msgstr "" "Podle aktuálních možností budou sjednoceny do hlavního typu.\n" "Chcete zmìnit možnosti a zachovat rozdílné konce øádkù?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Zvolená složka je chybná." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Binární soubor nelze otevøít pro úpravy." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4649,132 +4656,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Upozornìní: Soubory používají rozdílné kódování, levé=%s a pravé=%s, a sluèování mùže vést ke ztrátì informací." -#: Merge.rc:2356 +#: Merge.rc:2359 #, 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:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Došlo ke ztrátì informací zpùsobené chybami kódování u pravého souboru." -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Došlo ke ztrátì informací zpùsobené chybami kódování u levého souboru." -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Žádný rozdíl" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Rozdíl v øádku" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahrazeno %1 øetìzcù." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nelze najít øetìzec \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Zkopíruje celou cestu k souboru do schránky" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Zkopíruje název souboru do schránky" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Poloha" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Rozdíly" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Opravný soubor byl úspìšnì vytvoøen." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. položka nebyla nalezena nebo je to složka!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. položka nebyla nalezena nebo je to složka!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[vybráno %1 souborù]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Nelze zapisovat do souboru %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, 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:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Zadejte výstupní soubor" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nelze vytvoøit opravný soubor z binárních souborù." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nelze vytvoøit opravný soubor ze složek." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4785,17 +4792,17 @@ msgstr "" "\n" "Vytvoøení opravného souboru vyžaduje, aby v souborech nebyly žádné neuložené zmìny." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Složka neexistuje." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Aktuální výsledek porovnání složek bude vymazán." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4807,7 +4814,7 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4816,7 +4823,7 @@ msgstr "" "\n" "Poznámka: Integrace 7-Zip je vypnutá v nastavení WinMerge." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4825,37 +4832,37 @@ msgstr "" "\n" "Poznámka: Integrace 7-Zip je omezená na samostatné operace v nastavení WinMerge." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Uložit nastavení" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Naèíst nastavení" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Nastavení bylo naèteno ze souboru." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Nastavení bylo uloženo do souboru." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Naètení nastavení ze souboru se nezdaøilo." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Uložení nastavení do souboru se nezdaøilo." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4866,1098 +4873,1098 @@ msgstr "" "\n" "Chcete pokraèovat?" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Chyba v regulérním výrazu" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Nic neodpovídá" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Chybný regulérní výraz" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Chybný porovnávací znak" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Chybný znak v názvu tøídy" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Zpìtné lomítko na konci" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Chybný zpìtný odkaz" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Nespárované [ nebo [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Nespárované ( nebo \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Nespárované \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Chybný obsah \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Chybné ukonèení rozsahu" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Nedostatek pamìti" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Chybný pøedcházející regulérní výraz" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Pøedèasné ukonèení regulérního výrazu" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Regulérní výraz je pøíliš dlouhý" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Nespárované ) nebo \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norwegian (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Rùzné" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " kB" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Uloží levý soubor" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Uloží pravý soubor" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Uloží levý soubor pod názvem..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Uloží pravý soubor pod názvem..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Zmìní soubor/složku vlevo do stavu pouze pro ètení" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Zmìní soubor/složku vpravo do stavu pouze pro ètení" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Pøevede konce øádkù do typu DOS" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Pøevede konce øádkù do typu UNIX" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Pøevede konce øádkù do typu MAC" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Pøepíná mezi režimem úprav a režimem sluèování" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5966,12 +5973,12 @@ msgstr "" "Ukáže a pøizpùsobí vlastnosti kódování souboru\n" "Vlastnosti kódování souboru" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5980,7 +5987,7 @@ msgstr "" "Vybere oblast rozdílù v aktuálním øádku\n" "Rozdíl v aktuálním øádku" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5989,7 +5996,7 @@ msgstr "" "Pøejde na daný øádek nebo na daný rozdíl\n" "Pøejít na (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5998,7 +6005,7 @@ msgstr "" "Umožní zmìnit nastavení aplikace\n" "Možnosti" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6007,37 +6014,37 @@ msgstr "" "Obnoví zobrazení\n" "Obnovit (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Zkopíruje vybrané øádky do schránky a pøidá jim na zaèátek jejich èísla øádkù" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Obnoví vybrané položky" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Založí nebo zruší záložku" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Pøejde na další záložku" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Pøejde na pøedchozí záložku" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Zruší všechny záložky" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6046,7 +6053,7 @@ msgstr "" "Zobrazí položky, které se pøesnì shodují\n" "Ukázat shodné položky" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6055,7 +6062,7 @@ msgstr "" "Zobrazí položky, ve kterých jsou rozdíly\n" "Ukázat rozdílné položky" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6064,7 +6071,7 @@ msgstr "" "Zobrazí položky, které existují pouze na levé stranì\n" "Ukázat levé jedineèné položky" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6073,7 +6080,7 @@ msgstr "" "Zobrazí položky, které existují pouze na pravé stranì\n" "Ukázat pravé jedineèné položky" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6082,7 +6089,7 @@ msgstr "" "Zobrazí binární soubory\n" "Ukázat binární soubory" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6091,7 +6098,7 @@ msgstr "" "Zobrazí pøeskoèené položky\n" "Ukázat pøeskoèené položky" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6100,7 +6107,7 @@ msgstr "" "Vybere písmo pro zobrazení\n" "Vybrat písmo" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6109,27 +6116,27 @@ msgstr "" "Vrátí výchozí písmo systému pro zobrazení\n" "Výchozí písmo" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Ukáže netisknutelné znaky" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Zobrazí nebo skryje rozdílový panel" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Polohový panel ukazuje celkový obraz porovnávaných souborù" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Zobrazí statistiku porovnání složek" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6138,7 +6145,7 @@ msgstr "" "Umožní zvolit jazyk uživatelského prostøedí aplikace\n" "Jazyk" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6147,12 +6154,12 @@ msgstr "" "Ukáže rozdíly v øádcích odlišnou barvou\n" "Rozdíly v øádcích" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Zamìní umístìní panelù s porovnáním souborù" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6161,7 +6168,7 @@ msgstr "" "Zobrazí nebo skryje èísla øádkù\n" "Zobrazit èísla øádkù" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6170,24 +6177,24 @@ msgstr "" "Pøepíná zalamování øádkù\n" "Zalamovat øádky" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6196,7 +6203,7 @@ msgstr "" "Posune na pøedchozí rozdíl\n" "Pøedchozí rozdíl (Alt+Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6205,7 +6212,7 @@ msgstr "" "Posune na další rozdíl\n" "Další rozdíl (Alt+Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6214,7 +6221,7 @@ msgstr "" "Posune na první rozdíl\n" "První rozdíl (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6223,7 +6230,7 @@ msgstr "" "Posune na aktuální rozdíl\n" "Aktuální rozdíl (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6232,7 +6239,7 @@ msgstr "" "Posune na poslední rozdíl\n" "Poslední rozdíl (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6241,7 +6248,7 @@ msgstr "" "Zkopíruje vybraný rozdíl do souboru vpravo\n" "Kopírovat doprava (Alt+Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6250,7 +6257,7 @@ msgstr "" "Zkopíruje vybraný rozdíl do souboru vlevo\n" "Kopírovat doleva (Alt+Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6259,7 +6266,7 @@ msgstr "" "Zkopíruje vybraný rozdíl do souboru vpravo a pokraèuje na další rozdíl\n" "Kopírovat doprava a pokraèovat (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6268,7 +6275,7 @@ msgstr "" "Zkopíruje vybraný rozdíl do souboru vlevo a pokraèuje na další rozdíl\n" "Kopírovat doleva a pokraèovat (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6277,7 +6284,7 @@ msgstr "" "Zkopíruje všechny rozdíly do souboru vpravo\n" "Vše doprava" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6286,72 +6293,72 @@ msgstr "" "Zkopíruje všechny rozdíly do souboru vlevo\n" "Vše doleva" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Odstraní vybrané položky z obou složek" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Porovná vybranou položku (pokud je vybráno více položek, porovná první)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Zvolit a pøeskupit sloupce v oknì porovnání složek" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Vytvoøí opravný soubor" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Vybrat a upravit filtry" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Vytvoøí protokol o výsledku porovnání složek" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Uživatel sám vybere pøevadìè (neplatí pøi porovnání složek)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Zvolí pøevadìè pro úpravy tohoto souboru" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Navržené pluginy" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Ostatní pluginy" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Uvolní všechny pluginy a znovu je naète (pro vývojáøe)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6360,12 +6367,12 @@ msgstr "" "Aktivovat následující viditelný soubor\n" "Aktivovat následující soubor" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Zavøe všechna otevøená okna" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6374,22 +6381,22 @@ msgstr "" "Zobrazí uživatelskou pøíruèku aplikace WinMerge\n" "Nápovìda" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Vytvoøí textový soubor obsahující informace o aktuální verzi aplikace WinMerge a o místní konfiguraci" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Zobrazí veøejnou licenci &GNU" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6398,7 +6405,7 @@ msgstr "" "Otevøe rejstøík nápovìdy pro aplikaci WinMerge\n" "Rejstøík nápovìdy" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6407,267 +6414,272 @@ msgstr "" "Otevøe hledání v nápovìdì pro aplikaci WinMerge\n" "Hledat nápovìdu" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Nastavení pluginù" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Program Windows Script Host nebyl nalezen - skripty .sct jsou vypnuté" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "<žádný>" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Otevøe soubor v pøidružené aplikaci" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Otevøe soubor v externím editoru" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Otevøe soubor v pøíslušném programu" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Potlaèí zobrazení pøesunutých blokù" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Zobrazí všechny pøesunuté bloky" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Zobrazí pøesunuté bloky týkající se pouze aktuálního výbìru" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Pøejde na øádek nebo rozdíl pod ukazatelem" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "&Pøejít na rozdíl %1 z %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "&Pøejít na øádek %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Vypnuto" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Systém souborù" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Naposledy použité" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Skryje panel nástrojù" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Zobrazí malý panel nástrojù" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Zobrazí velký panel nástrojù" diff --git a/Src/Languages/Danish.po b/Src/Languages/Danish.po index a192d1487..308adda7b 100644 --- a/Src/Languages/Danish.po +++ b/Src/Languages/Danish.po @@ -71,7 +71,7 @@ msgstr "&Klip" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "Ko&pier" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "&Indsæt" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "Gå &til..." @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "Åb&en" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "med det ®istrerede program" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "med en &ekstern editor" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&med..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Filer" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Åben...\tCtrl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Åben pro&jekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Gem &projekt..." @@ -158,2441 +158,2448 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Afslut" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Rediger" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "I&ndstillinger..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Vis" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Vælg &skrifttype..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Brug standard s&krifttype" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "S&tatuslinje" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "S&prog..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "Værk&tøjer" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtre..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Generer en Patch..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "&Manuel Udpakning" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk Udpakning" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "R&ediger med Udpakker" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Genindlæs plugins" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "Vind&ue" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Luk" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Luk &alle" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "&Skift panel\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "&Horisontale vinduer" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "&Vertikale vinduer" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Kaskade" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Hjælp" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "Ind&hold...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Indeks..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Søg..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "&Konfiguration..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "&Understøttelse for arkivering er afbrudt..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "" -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&Om WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Åben pro&jekt...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "V&enstre skrivebeskyttet" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "&Højre skrivebeskyttet" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "Fil En&coding" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vælg &alt\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Vis &identiske" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Vis &forskellige" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Vis &venstre unikke" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Vis &højre unikke" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Vis &oversprungne" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Vis &binære filer" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "V&is skjulte" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Sammen&ligningsstatistikker" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Opdater\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Flet" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Sammen&lign\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Næste forskel\tAlt+Ned" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Forrige forskel\tAlt+Op" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "F&ørste forskel\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuelle forskel\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Sidste forskel\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopier til &højre\tAlt+Højre" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopier til &venstre\tAlt+Venstre" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "Sl&et\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Tilpas søjler..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Generer en &raport..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Gem\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Gem &venstre" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Gem" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Gem &som..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Gem &højre" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Konverter linjeendelserne til" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "&Flette modus\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Fortryd\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Gendan\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klip\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&pier\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Indsæt\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Vælg &linjeforskel\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "S&øg...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Erstat...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Tom >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Avanceret" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopier med linjenumre\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Bogmærker" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Toggle bogmærke\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Næste bogmærke\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Forrige bogmærke\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Slet alle bogmærker" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gå til...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Vis &mellemrum" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "H&orisontalt panel" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "V&ertikalt panel" -#: Merge.rc:428 +#: Merge.rc:430 #, 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:429 +#: Merge.rc:431 #, 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:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Kopier alt &til højre" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Kopier alt til venst&re" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&Venstre til højre" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "V&enstre til..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "&Højre til venstre" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "H&øjre til..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Flyt" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Venstre til..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&Højre til..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Slet" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Venstre" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Højre" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Begge" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "&Åben venstre" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Å&ben højre" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "K&opier stinavne" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Venstre (%1 af %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Højre (%1 af %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Begge (%1 af %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Ko&pier filnavne" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Venstre... (%1 af %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Højre... (%1 af %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Begge... (%1 af %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Forskellene... (%1 af %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "&Kopier det fulde stinavn" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Kopier &filnavn" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Prediffer indstillinger" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Ingen prediffer" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "&Automatisk prediffer" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Gå til &forskel" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Ingen flyttede blokke" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Alle flyttede blokke" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttede blokke for &denne forskel" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Alle rettigheder forbeholdes" -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besøg WinMerge hjemmesiden!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Vælg filer eller mapper..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Venstre:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Gennemse..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Højre:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "G&ennemse..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "V&ælg..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Væ&lg..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Inkluder undermapper" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Afbryd" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller mapper der skal sammenlignes" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Gem som..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Versionsstyringssystem" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Versionsstyringssystem" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sti til cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Generelt" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatisk &scroll til første forskel" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Fjern Splash Screen" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "L&uk vinduer med ESC tasten" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verificer automatisk stinavnene i åben dialogen" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "&Allow only one instance to run" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Nulstil" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Sprog" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Tilgængelige sprog:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Søg" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "F&ind hvad:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Sammenlign &hele ordet" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Sammenlign store/små &bogstaver" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "Regulært &udtryk" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Retning" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Op" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "&Ned" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Find næste" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Erstat" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Ers&tat med:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "&Begynd ikke forfra efter enden af filen" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Erstat i" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Valgte" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "He&le filen" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Erstat" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Erstat &alt" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Linjefiltre" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulære udtryk (et pr linje):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Farver" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Forskelle:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Valgte forskelle:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Baggrund" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Slettet" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Ignoreret forskel:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Flyttet:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Valgt flyttet:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Standard" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Send slettede filer til skraldespanden" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Tilføj til explorer context menu" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "&Aktiver den avancerede menu" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Ekstern editor:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Fil&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Fil&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "G&ennemse..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "&Byt" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "&Tilføj til eksisterende fil" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "Res&ultat:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "Sti&l:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Sammenhæng:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "&Mellemrum" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "S&ammenlign" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "&Ignorer ændringer" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Ign&orer alle" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Igno&rer blanke linjer" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Sammenlign store/sm&å bogstaver" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Inkluder &kommandolinjen" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Åben i ekstern e&ditor" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Vis søjler" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Vælg udpakker" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Fil udpakker:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Vis all udpakkerer, tjek ikke extension" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Beskrivelse:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Gå til" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "G&å til:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Gå til hvad" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "Li&nje" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Forskel" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Gå til" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Sammenlign" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Mellemrum" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "&Sammenlign" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "&Ignorer ændringer" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "I&gnorer alle" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer blan&ke linjer" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignorer store/små &bogstaver" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Igno&rer linjeskift forskelle (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "&Aktiver detektion af flyttede blokke" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "&Fil sammenligningsmetode:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "&Fremhæv syntaksen" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &opdatering" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "&Bevar originale EOL tegn" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulator" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Tabulator størrelse:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "&Indsæt tabulatorer" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Indsæt &mellemrum" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filfiltre" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Rediger..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Gem ændrede filer?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Fil på venstre side" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Gem ændringer" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Fjern ændringer" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Fil på højre side" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "G&em ændringer" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "F&jern ændringer" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" "need to restart session" msgstr "" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Samme som WinMerge brugerflade" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Udvalgt codepage :" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" "(You can always recall this message from help menu.)" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Forskellige" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identiske" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Afbryd" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Christian List" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x406, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2601,7 +2608,7 @@ msgstr "" "Opret tomme dokumenter\n" "Nye dokumenter (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2610,7 +2617,7 @@ msgstr "" "Åben et eksisterende dokument\n" "Åben (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2619,7 +2626,7 @@ msgstr "" "Luk det aktive dokument\n" "Luk" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2628,7 +2635,7 @@ msgstr "" "Gem det aktive dokument\n" "Gem (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2637,7 +2644,7 @@ msgstr "" "Gem det aktive dokument med et nyt navn\n" "Gem som" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2646,7 +2653,7 @@ msgstr "" "Ændrer på printerens indstillinger\n" "Sideopsætning" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2655,7 +2662,7 @@ msgstr "" "Ændrer printer og printerens indstillinger\n" "Printer setup" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2664,7 +2671,7 @@ msgstr "" "Print det aktive dokument\n" "Print" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2673,51 +2680,51 @@ msgstr "" "Vis de fulde sider\n" "Printer preview" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" "Project file (Ctrl+J)" msgstr "" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2726,7 +2733,7 @@ msgstr "" "Vis program information, versionsnummer og ophavsret\n" "Om" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2735,9 +2742,6 @@ msgstr "" "Afslut programmet; spørger om man vil gemme dokumenter\n" "Afslut" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2751,11 +2755,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Åben dette dokument" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2764,7 +2771,7 @@ msgstr "" "Skift til det næste vindue\n" "Næste vindue" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2773,7 +2780,7 @@ msgstr "" "Skift til det tidligere vindue\n" "Tidligere vindue" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2782,7 +2789,7 @@ msgstr "" "Åben et nyt vindue til det aktive dokument\n" "Nyt vindue" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2791,7 +2798,7 @@ msgstr "" "Arranger iconerne i bunden af vinduet\n" "Arranger iconer" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2800,7 +2807,7 @@ msgstr "" "Arranger vinduerne så de overlapper\n" "Kaskade vinduer" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2809,7 +2816,7 @@ msgstr "" "Arranger vinduerne som ikke-overlappende brikker\n" "Brikker vinduer" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2818,7 +2825,7 @@ msgstr "" "Arranger vinduerne som ikke-overlappende brikker\n" "Brikker vinduer" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2827,7 +2834,7 @@ msgstr "" "Del det aktive vindue\n" "Del" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2836,7 +2843,7 @@ msgstr "" "Slet det valgte\n" "Slet" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2845,7 +2852,7 @@ msgstr "" "Slet alt\n" "Slet alt" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2854,7 +2861,7 @@ msgstr "" "Kopier det valgte og sæt det i udklipsholderen\n" "Kopier" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2863,7 +2870,7 @@ msgstr "" "Klip det valgte ud og sæt det i udklipsholderen\n" "Klip" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2872,7 +2879,7 @@ msgstr "" "Find den angivne tekst\n" "Find" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2881,7 +2888,7 @@ msgstr "" "Indsæt udklipsholderens indhold\n" "Indsæt" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2890,7 +2897,7 @@ msgstr "" "Gentag den sidste handling\n" "Gentag" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2899,7 +2906,7 @@ msgstr "" "Erstat den angivne tekst med en anden tekst\n" "Erstat" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2908,7 +2915,7 @@ msgstr "" "Vælg hele dokumentet\n" "Vælg alt" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2917,7 +2924,7 @@ msgstr "" "Fortryd den sidste handling\n" "Fortryd" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2926,7 +2933,7 @@ msgstr "" "Gendan den tidligere fortrudte handling\n" "Gendan fortrudt" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2935,7 +2942,7 @@ msgstr "" "Vis eller gem værktøjslinjen\n" "Vis værktøjslinjen" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2944,69 +2951,69 @@ msgstr "" "Vis eller gem statuslinjen\n" "Vis statuslinjen" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Ændre vinduesstørrelse" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Ændre vinduesposition" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Minimer vindue til en icon" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Maximer vindue til fuld størrelse" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Skift til det næste dokument vindue" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Skift til det tidligere dokument vindue" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Luk det aktive vindue og spørg efter om dokumenter skal gemmes" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Gendan vindue i normal størrelse" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Liste med aktive vinduer" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Aktiver dette vindue" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3015,7 +3022,7 @@ msgstr "" "Luk print preview\n" "Afbryd preview" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3027,175 +3034,175 @@ msgid "" "WinMerge Document" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Bevar originale EOL tegn" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Tryk på en tilfældig tast" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Højreklik på stien for at kopiere" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Fortryd" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Prøv igen" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "I&gnorer alle" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Ja til &alle" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Nej til a&lle" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Fortsæt" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Spring over" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Spring over all&e" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Vis ikke denne &besked igen." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Stil ikke dette sp&ørgsmål igen." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Indstillinger (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle beskeder vises nu igen." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Der er lavet ændringer i nogle indstillinger, der kan have indflydelse på allerede åbne vinduer. Nogle af disse indstillinger virker muligvis ikke før vinduerne er genåbnet." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Den valgte ændring af skrifttype vil ikke kunne ses i allerede åbne vinduer." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3203,7 +3210,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3211,107 +3218,107 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Åben" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1950 +#: Merge.rc:1953 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Ændringsdato" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Navn" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Sti" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3320,7 +3327,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3329,7 +3336,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3337,7 +3344,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3346,12 +3353,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3359,208 +3366,208 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Sti til cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Sti til SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Resultat af sammenligning af mapper" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Filsammenligning" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Ikke navngivet venstre" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Ikke navngivet højre" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Skanner filer..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Åbner valgte" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Kopierer venstre til højre" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Kopierer højre til venstre" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Kopierer alt til venstre" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Kopierer alt til højre" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Kopierer filer..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Sletter filer..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Flytter filer..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Flet" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Forskel %1 af %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 forskelle fundet" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 forskel fundet" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vælg to eksisterende mapper eller filer at sammenligne" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Valgt mappe" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Vælg to mapper eller to filer at sammenligne." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Ventre sti er ugyldig!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Højre sti er ugyldig!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Begge stier er ugyldige!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vælg to filer for at aktivere udvælgelse af udpakker." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne en fil og en mappe!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Fil ikke fundet: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke udpakket: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3573,7 +3580,7 @@ msgstr "" "\n" "er identiske binære filer." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3586,7 +3593,7 @@ msgstr "" "\n" "er forskellige binære filer." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3597,7 +3604,7 @@ msgstr "" "\n" "er en binær fil. Kan ikke sammenligne binære filer med tekst filer." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3610,37 +3617,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Gem som" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Gem ændringer til %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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 markeret som skrivebeskyttet. Vil du ignorerer skrivebeskyttelsen? (Nej for at gemme til et andet filnavn.)" -#: Merge.rc:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Fejl ender tjek af skrivebeskyttelsen på destinationen" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Fejl under backup af filen" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3649,7 +3656,7 @@ msgid "" "Continue anyway?" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3660,7 +3667,7 @@ msgid "" "\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3675,7 +3682,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3690,7 +3697,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3705,7 +3712,7 @@ msgstr "" "\n" "Vil du overskrive den ændrede fil?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3714,7 +3721,7 @@ msgstr "" "%1\n" "er markeret som skrivebeskyttet. Vil du overskrive den skrivebeskyttede fil alligevel?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3729,17 +3736,17 @@ msgstr "" "\n" "Hvis du vil opdatere dine filer skal du lukke de nuværende filer og genindlæse dem." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Gem venstre fil som" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Gem højre fil som" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3747,42 +3754,42 @@ msgid "" "Refresh documents before continuing." msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Du skal angive en SourceSafe projekt sti for at fortsætte (ie: $/MitProjekt)" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout filer fra VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versionsstyringssystemet returnerede en fejl under forsøget på at checke filen ud. Kan ikke fortsætte..." -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Fejl under udførelse af versionsstyringssystem kommando." -#: Merge.rc:2107 +#: Merge.rc:2110 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Arbejdsmappen for VSS og mappen for den aktuelle fil er ikke ens. Vil du fortsætte?" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) fundet!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Fejl fra VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3790,186 +3797,186 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2114 #, 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Slet det valgte element til venstre" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Slet det valgte element til højre" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Slet de valgte element(er) på begge sider" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Højre til venstre (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Venstre til højre (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Højre til venstre (%1 af %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Venstre til højre (%1 af %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Højre til... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Venstre til... (%1 af %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Højre til... (%1 af %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Højre (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Venstre (%1 af %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Højre (%1 af %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Begge (%1 af %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Vælg en destinationsmappe" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Er du sikker på du vil kopiere alle forskelle til den venstre fil?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Er du sikker på du vil kopiere alle forskelle til den højre fil?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -3985,17 +3992,17 @@ msgstr "" "til\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Er du sikker på du vil kopiere %1 af %2 valgt(e) element(er)?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Er du sikker på du vil slette %1 af %2 valgt(e) element(er)?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4006,7 +4013,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4017,17 +4024,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4039,505 +4046,505 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Åben venstre fil" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Åben venstre fil i ekstern editor" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Åben venstre fil med ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Åben højre fil" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Åben højre fil i ekstern editor" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Åben højre fil med ..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopier filnavn til clipboard" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopier venstre sides mappenavne til clipboard" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopier højre sides mappenavne til clipboard" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopier begge siders mappenavne til clipboard" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Ukendt arkivformat" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Tilføj elementer fra venstre side til arkiv" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Tilføj elementer fra højre side til arkiv" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Tilføj elementer fra begge sider til arkiv" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Tilføj elementer der er forskellige til arkiv (fra begge sider)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Flyt den valgte fil på venstre side til udvalgt mappe" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Flyt den valgte fil på højre side til udvalgt mappe" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Mappe" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Resultat af sammenligning" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Højre dato" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Venstre størrelse" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Højre størrelse" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Venstre oprettelsesdato" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Højre oprettelsesdato" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Nyeste fil" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Venstre filversion" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Højre filversion" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Højre attributter" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Venstre Encoding" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Højre Encoding" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binær" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Fil sprunget over" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Mappe sprunget over" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Binære filer er identiske" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Binære filer er forskellige" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Filer er forskellige" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Kun venstre" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Kun højre" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tid forløbet: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 element valgt" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 elementer valgt" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Filnavn eller mappenavn." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkluderet." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Resultat af sammenligning, lang form." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Venstre side ændringsdato." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Højre side ændringsdato." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Filens extension." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstørrelse i bytes." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Højre filstørrelse i bytes." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Venstre side oprettelsesdato." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Højre side oprettelsesdato." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Fortæller hvilken side har den nyeste ændringsdato." -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversion, kun for nogle filtyper." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Højre side filversion, kun for nogle filtyper." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Kort resultat af sammenligning." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Højre side attributter." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Venstre side encoding." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Højre side encoding." -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Vis stjerne (*) hvis fil er binær." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Sammenlign %1 med %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Den samme fil er åbnet på begge sider." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "De valgte filer er identiske." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Der skete en fejl under sammenligning af filerne." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Binære filer kan ikke sammenlignes visuelt." -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Midlertidige filer kunne ikke oprettes. Tjek dine indstillinger for midlertidig (temp) mappe." -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Mapper kan ikke sammenlignes visuelt." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4547,7 +4554,7 @@ msgid "" "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4558,22 +4565,22 @@ msgstr "" " Med de nuværende indstillinger, vil de blive omdannet til hovedtypen.\n" " Vil du ændrer indstilingerne og bevare de forskellige EOL ?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Der skete en fejl under prediffing af filen '%1' med plugin '%2'. Denne prediffing er ikke brugt mere." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4584,132 +4591,132 @@ msgstr "" "Visning af hver fil i sin egen codepage vil give et bedre visuelt resultat men fletning/kopiering vil være farligt.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Ingen forskel" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Linje forskel" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(e)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finde strengen \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Kopier det fulde mappenavn" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Kopier filnavn" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Patch fil oprettet med succes." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element er ikke fundet eller er en mappe!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element er ikke fundet eller er en mappe!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke lave patch filer fra binære filer." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke lave patch filer fra mapper." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4717,17 +4724,17 @@ msgid "" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Nuværende resultat af sammenligning af mapper vil blive nulstillet." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4738,51 +4745,51 @@ msgstr "" "Alle komponenter (7-zip og/eller Merge7z*.dll) der er nødvendige til arkiv support kan ikke findes.\n" "Se manualen for mere information om arkiv support og hvordan man aktivere det." -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4790,1117 +4797,1117 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Fejl ved regulært udtryk" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Ingen match" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Ugyldigt regulært udtryk" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Regulært udtryk er for stort" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albansk" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabisk (Saudi Araben)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabisk (Irak)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabisk (Egypten)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabisk (Libyen)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabisk (Algeriet)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabisk (Marocco)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabisk (Tunesien)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabisk (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabisk (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabisk (Syrien)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabisk (Jordan)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabisk (Libanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabisk (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabisk (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabisk (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabisk (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armenien" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Hviderussisk" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgarsk" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalansk" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Kinesisk (Traditionelt)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Kinesisk (Simplificeret)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Kinesisk (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Kinesisk (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Kinesisk (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Kroatisk" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Tjekkisk" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Hollandsk" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Hollandsk (Belgien)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Engelsk (USA)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Engelsk (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Engelsk (Australien)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Engelsk (Canada)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Engelsk (New Zealand)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Engelsk (Irsk)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Engelsk (Syd Afrika)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Engelsk (Jamaica)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Engelsk (Caribien)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Engelsk (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Engelsk (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Engelsk (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Engelsk (Philippinerne)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Estisk" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Færøsk" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Finsk" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Fransk" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Fransk (Belgien)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Fransk (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Fransk (Schweiz)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Fransk (Luxembourg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Fransk (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgisk" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Tysk (Tyskland)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Tysk (Schweiz)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Tysk (Østrig)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Tysk (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Tysk (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Græsk" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebraisk" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Ungarsk" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Islandsk" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesisk" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italiensk" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italiensk (Schweiz)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japansk" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmiri (Indien)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Koreansk" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Koreansk (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Lettisk" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lithauisk" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norsk (Bokmål)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norsk (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polsk" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugisisk" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugisisk (Brasilien)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Rumansk" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russisk" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbisk (Latin)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbisk (Kyrillisk)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Slovakisk" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Slovensk" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Spansk" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Spansk (Mexikans)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Spansk (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Spansk (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Spansk (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Spansk (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Spansk (Dominican)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Spansk (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Spansk (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Spansk (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Spansk (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Spansk (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Spansk (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Spansk (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Spansk (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Spansk (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Spansk (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Spansk (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Spansk (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Spansk (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Svensk" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Svensk (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Tyrkisk" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ukrainsk" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (Indien)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamesisk" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Gem den venstre fil" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Gem den højre fil" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Gem den venstre fil med navnet..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Gem den højre fil med navnet..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Ændre venstre fil/mappe status for skrivebeskyttelse" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Ændre højre fil/mappe status for skrivebeskyttelse" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Konverter EOL til DOS mode" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Konverter EOL til UNIX mode" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Konverter EOL til MAC mode" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Skift mellem rediger og flette tilstande" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5909,7 +5916,7 @@ msgstr "" "Gå til linje eller forskel\n" "Gå til (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5918,7 +5925,7 @@ msgstr "" "Sæt program indstillinger\n" "Indstillinger" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -5927,113 +5934,113 @@ msgstr "" "Opdater display\n" "Opdater (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" "Select View Font" msgstr "" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" "Default Font" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Viser et tegn for mellemrum" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Vis eller gem horisontalt panel" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Vis eller gem vertikalt panel" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6042,50 +6049,50 @@ msgstr "" "Vælg sprog til brugerfladen\n" "Sprog" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" "Show Line Diff" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6094,7 +6101,7 @@ msgstr "" "Scroll til den forrige forskel\n" "Forrige forskel (Alt Op)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6103,7 +6110,7 @@ msgstr "" "Scroll til den næste forskel\n" "Næste forskel (Alt Ned)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6112,7 +6119,7 @@ msgstr "" "Scroll til den første forskel\n" "Første forskel (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6121,7 +6128,7 @@ msgstr "" "Scroll til den aktuelle forskel\n" "Aktuelle forskel (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6130,7 +6137,7 @@ msgstr "" "Scroll til den sidste forskel\n" "Sidste forskel (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6139,7 +6146,7 @@ msgstr "" "Kopier den valgte tekst til den højre fil\n" "Kopier højre (Alt Højre)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6148,7 +6155,7 @@ msgstr "" "Kopier den valgte tekst til den venstre fil\n" "Kopier venstre (Alt Venstre)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6157,7 +6164,7 @@ msgstr "" "Kopier forskel til højre side og gå til næste forskel\n" "Kopier til højre og gå til næste (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6166,7 +6173,7 @@ msgstr "" "Kopier forskel til venstre side og gå til næste forskel\n" "Kopier til venstre og gå til næste (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6175,7 +6182,7 @@ msgstr "" "Kopier alle forskelle til den højre fil\n" "Alt til højre" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6184,72 +6191,72 @@ msgstr "" "Kopier alle forskelle til den venstre fil\n" "Alt til venstre" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Vælg og gen-sorter sammenligning af mapper" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Lav en patch-fil" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Vælge og ændrer filtre" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Brugeren vælger udpakkeren (ingen udpakning under sammenligning af mapper)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Udpakkeren bruges på begge filer (kun den ene fil behøves en korrekt extension)" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Vælg en udpakker til at redigere denne fil" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Anbefalede plugins" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Andre plugins" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Fjern alle plugins og genindlæs dem (for udviklere)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6258,12 +6265,12 @@ msgstr "" "Aktivere den næste synlige fil\n" "Aktiver næste fil" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6272,296 +6279,301 @@ msgstr "" "Vis hjælpen til WinMerge\n" "Hjælp" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Skriver den nuværende WinMerge versionsinformation og konfiguration til en tekst fil" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Vis GNU general public license" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" "Help Index" msgstr "" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" "Help Search" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Plugin indstillinger" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Ingen prediffer" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Prediff hvis muligt" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke fundet - .sct scripts afbrudt" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Vis ikke flyttede blokke" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Vis alle flyttede blokke" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Vis kun flyttede blokke fra den nuværende forskel" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Gå til forskel under cursor" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G&å til forskel %1 af %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "G&å til linje %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Dutch.po b/Src/Languages/Dutch.po index 88a296f28..0e70e4429 100644 --- a/Src/Languages/Dutch.po +++ b/Src/Languages/Dutch.po @@ -72,7 +72,7 @@ msgstr "&Knippen" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "Ko&piëren" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "Pl&akken" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&Ga naar..." @@ -95,43 +95,43 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "met ge®istreerde applicatie" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "met &externe editor" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&met..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Bestand" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Openen...\tCtrl+O" @@ -147,8 +147,8 @@ msgid "Open Project...\tCtrl+J" msgstr "" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -159,1845 +159,1852 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Afsluiten" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "Be&werken" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Eigenschappen..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "B&eeld" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Kies &Font..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Gebruik standaard F&ont" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "&Status Balk" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Taal..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "" #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "" #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Plug-ins" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "Hand&matig uitpakken" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisch uitpakken" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "B&ewerken met uitpakker" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "Plug-ins he&rladen" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Venster" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "Sluiten" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "&Venster wijzigen\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "&Horizontaal verdelen" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "&Vertikaal verdelen" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Trapsgewijs" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Inhoud...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "" #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "" #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "C&onfiguratie..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "A&rchiefondersteuning uitgeschakeld..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "&GNU Publieke Licentie..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "I&nfo..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Links all&een lezen" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Re&chts alleen lezen" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Alles selecteren\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "Verver&sen\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Volgende verschil\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Vor&ige verschil\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Eerste verschil\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Huidig verschil\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Laatste Verschil\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopieer naar &Rechts\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopieer naar &Links\tAlt+left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Kolommen aanpassen..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "Op&slaan\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "&Links opslaan" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "Op&slaan" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Opslaan &als..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "&Rechts opslaan" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Sa&menvoegmodus\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Ongedaan maken\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "He&rhalen\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Knippen\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&piëren\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "Pl&akken\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Z&oeken...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Vervan&gen...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Leeg >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Wit&ruimte tonen" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Location &Pane" -#: Merge.rc:428 +#: Merge.rc:430 #, 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:429 +#: Merge.rc:431 #, 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:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Alles naar rechts kopiëren" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Alles naar links kopiëren" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "Van &links naar rechts" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "Van l&inks naar..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "Van &rechts naar links" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "Van r&echts naar..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Verplaatsen" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "Van &links naar..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "Van &rechts naar..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "Ver&wijderen" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Links" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Rechts" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Beide" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "Links &openen" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Rechts o&penen" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Padnamen ko&piëren" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Links (%1 van %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Rechts (%1 van %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Beide (%1 van %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "&Bestandsnamen kopiëren" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "&Comprimeren" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Links... (%1 van %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Rechts... (%1 van %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Beide... (%1 van %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Verschillen... (%1 van %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "&Volledig pad kopiëren" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "&Bestandsnaam kopiëren" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Instellingen voorvergelijking verschillen" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Geen voorvergelijking" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Automatische voorvergelijking" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "G&a naar verschil" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "Gee&n verplaatste blokken" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Alle verplaatste blokken" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Verplaatste blokken voor huidige vers&chillen" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Alle rechten voorbehouden." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Bezoek deWinMerge HomePage!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Bestanden of mappen selecteren" -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Links:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Zoeken" -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Rechts:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "Zoe&ken" -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Selecteren..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "&Uitpakker:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "&Selecteren..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "Ook &in submappen" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Annuleren" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Bestanden of mappen om te vergelijken" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Gebruiker:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Wachtwoord:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Link naar VSS doelproject" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Op alle items toepassen" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Check-out" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Opslaan als..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Versiebeheersysteem" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Versiebeheersysteem:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pad naar cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Algemeen" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Automatisch naar eerste verschil gaan" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "Splash Screen uitscha&kelen" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Vensters met ESC sl&uiten" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Paden automatisch controleren in het venster Openen" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "&Allow only one instance to run" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Herstellen" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Taalkeuze" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Beschikbare talen" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Zoeken" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "Zoeke&n naar:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Alleen hele &woorden" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Hoofdle&ttergevoelig" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "Reguliere &expressies" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Richting" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Omhoog" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "O&mlaag" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Volgende" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Vervangen" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Ver&vangen door:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "Bij einde bestan&d stoppen" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Vervangen in" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Selectie" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "&Hele bestand" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "Ve&rvangen" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "&Alles vervangen" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "Check-out" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Opmerkingen" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Regelfilters" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguliere Expressies (één per regel):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Kleuren" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Verschil:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Geselecteerd verschil:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Achtergrond" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Verwijderd" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Genegeerd verschil:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Verplaatst:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Geselecteerd verplaatst verschil:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Standaard" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Dialoog" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Systeem" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Verwijderde bestanden naar de Prullenbak verplaat&sen" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "Toevoegen &aan contextmenu van verkenner" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Geavanceerd me&nu inschakelen" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Externe editor:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Patch generator" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Bestand&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Bestand&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Bl&aderen..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "&Wisselen" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "Toevoegen &aan bestaand bestand" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Resultaat:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "&Formaat" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "St&ijl:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Witr&uimte" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "Ver&gelijken" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Wij&zigingen negeren" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Alle&s negeren" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Lege regels o&verslaan" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Hoo&fdlettergevoelig" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Inclusief opdrac&htregel" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Openen in e&xterne editor" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Kolommen weergeven" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Uitpakker kiezen" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Bestandsuitpakker:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Alle uitpakkers tonen zonder extensie te controleren" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Lijst extensies:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Beschrijving:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Stoppen" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Ga naar" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "G&a naar:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Bestand" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Ga naar" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "Re&gel" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Verschil" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Ga naar" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Vergelijken" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Witruimte" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "&Vergelijken" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "&Wijzigingen negeren" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Alles ne&geren" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Lege regels negeren" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "N&iet hoofdlettergevoelig" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "&Regeleindeverschillen (DOS/UNIX/MAC) negeren" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Detectie verplaatste blokken i&nschakelen" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Met&hode bestandsvergelijking:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "&Accentueer syntax" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "&Automatisch opnieuw scannen" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "Be&waar originele regeleindes" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabinstellingen" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Tabgrootte:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "Tabs &invoegen" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "&Spaties invoegen" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Bestandsfilters" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Bewerken..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Gewijzigde bestanden opslaan?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Linker bestand" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "Wijzigingen op&slaan" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "Wijzigingen ne&geren" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Rechter bestand" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "Wijzigingen opsl&aan" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Wijzigingen nege&ren" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Tekenset" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2006,596 +2013,596 @@ msgstr "" "Tekenset detecteren voor deze bestanden: .html, .rc \n" "herstarten sessie noodzakelijk" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Tekenset van systeem" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Volgens WinMerge gebruikersinterface" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Aangepaste tekenset:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" "(You can always recall this message from help menu.)" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Verschillend" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identiek" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "Annuleren" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041304e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Ronald Schaap, Jigal van Hemert" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x413, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Gereed" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2604,7 +2611,7 @@ msgstr "" "Lege documenten aanmaken\n" "Nieuwe documenten (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2613,7 +2620,7 @@ msgstr "" "Een bestaand document openen.\n" "Openen" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2622,7 +2629,7 @@ msgstr "" "Het actieve document sluiten.\n" "Sluiten" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2631,7 +2638,7 @@ msgstr "" "Actief document opslaan.\n" "Opslaan" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2640,7 +2647,7 @@ msgstr "" "Actief document opslaan met een andere naam.\n" "Opslaan als" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2649,7 +2656,7 @@ msgstr "" "De paginainstellingen wijzigen.\n" "Paginainstellingen" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2658,7 +2665,7 @@ msgstr "" "De printerinstellingen wijzigen.\n" "Printerinstellingen" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2667,7 +2674,7 @@ msgstr "" "Actief document afdrukken.\n" "Afdrukken" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2676,51 +2683,51 @@ msgstr "" "Afdrukvoorbeeld.\n" "Afdruk voorbeeld" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" "Project file (Ctrl+J)" msgstr "" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2729,7 +2736,7 @@ msgstr "" "Programma informatie, versie nummer en auteursrechten tonen.\n" "Info" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2738,9 +2745,6 @@ msgstr "" "Applicatie afsluiten, vraagt naar opslaan documenten\n" "Afsluiten" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2754,11 +2758,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Dit document openen" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2767,7 +2774,7 @@ msgstr "" "Ga naar het volgende venster deel.\n" "Volgende deel" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2776,7 +2783,7 @@ msgstr "" "Ga naar het vorige venster deel.\n" "Vorige deel" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2785,7 +2792,7 @@ msgstr "" "Een nieuw venster voor het actieve document openen.\n" "Nieuw venster." -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2794,7 +2801,7 @@ msgstr "" "Pictogrammen schikken aan onderzijde venster.\n" "Pictogrammen schikken" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2803,7 +2810,7 @@ msgstr "" "Alle vensters trapsgewijs rangschikken.\n" "Trapsgewijs" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2812,7 +2819,7 @@ msgstr "" "Alle vensters horizontaal rangschikken.\n" "Horizontaal rangschikken" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2821,7 +2828,7 @@ msgstr "" "Alle vensters verticaal rangschikken.\n" "Verticaal rangschikken" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2830,7 +2837,7 @@ msgstr "" "Het actieve venster splitsen.\n" "Splitsen" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2839,7 +2846,7 @@ msgstr "" "De selectie wissen.\n" "Wissen" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2848,7 +2855,7 @@ msgstr "" "Alles wissen\n" "Alles wissen" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2857,7 +2864,7 @@ msgstr "" "De selectie naar het klembord kopiëren\n" "Kopiëren" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2866,7 +2873,7 @@ msgstr "" "De slecetie naar het klembord verplaatsen.\n" "Knippen" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2875,7 +2882,7 @@ msgstr "" "De aangegeven tekst vinden.\n" "Vinden" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2884,7 +2891,7 @@ msgstr "" "Inhoud klembord invoegen\n" "Plakken" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2893,7 +2900,7 @@ msgstr "" "Laatste actie herhalen.\n" "Herhalen" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2902,7 +2909,7 @@ msgstr "" "Gespecificeerde tekst door een andere vervangen.\n" "Vervangen" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2911,7 +2918,7 @@ msgstr "" "Het hele document selecteren.\n" "Alles selecteren" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2920,7 +2927,7 @@ msgstr "" "Laatste actie ongedaan maken.\n" "Ongedaan maken" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2929,7 +2936,7 @@ msgstr "" "Ongedaangemaakte actie opnieuw uitvoeren.\n" "Opnieuw" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2938,7 +2945,7 @@ msgstr "" "De werkbalk tonen of verbergen\n" "Werkbalk" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2947,69 +2954,69 @@ msgstr "" "De statusbalk tonen of verbergen\n" "Statusbalk" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "De grootte van het venster wijzigen" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Het venster verplaatsen" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Venster minimaliseren" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Venster maximaliseren" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Naar volgend documentvenster" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Naar vorig documentvenster" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Het actieve venster sluiten, vraag naar opslaan van documenten." -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Venster terug naar vorige formaat" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Lijst actieve taken" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Dit venster activeren" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3018,7 +3025,7 @@ msgstr "" "Afdrukvoorbeeld sluiten.\n" "Afsluiten voorbeeld" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3030,175 +3037,175 @@ msgid "" "WinMerge Document" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Originele regeleindes behouden" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Druk op een willekeurige toets" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Klik rechts op het pad om het te kopiëren" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "OK" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Afbreken" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Herhalen" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Negeren" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "&Alles negeren" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Ja op &alles" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Nee" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Nee op a&lles" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Doorgaan" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Overslaan" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "&Alles overslaan" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Dit bericht niet &meer tonen." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Deze &vraag niet meer stellen." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Versie %1 - Nederlands" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Eigenschappen" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle berichtvensters worden weer weergegeven." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "De huidige bestandsvergelijkingssessie is gewijzigd. Sommige instellingen werken pas als de huidige bestandsvergelijking opnieuw wordt gestart." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "De geselecteerde wijziging van het lettertype wordt niet verwerkt in de openstaande vensters." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3206,7 +3213,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3214,107 +3221,107 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Openen" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Uitvoerbare bestanden|*.exe;*.bat;*.cmd|Alle bestanden (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle bestanden (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1950 +#: Merge.rc:1953 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Laatst veranderd datum" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Naam" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Lokatie" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3323,7 +3330,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3332,7 +3339,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3340,7 +3347,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3349,12 +3356,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3362,208 +3369,208 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Pad naar cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Pad naar SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Resultaten mapvergelijking" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Restultaten bestandsvergelijking" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Geen titel links" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Geen titel rechts" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Bestanden aan het scannen..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Bezig met openen van selectie" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Aan het kopiëren van links naar rechts" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Aan het kopiëren van rechts naar links" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Alles naar links aan het kopiëren" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Alles naar rechts aan het kopiëren" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Bezig met kopiëren van bestanden..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Bezig met verwijderen van bestanden..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Bezig met verplaatsen van bestanden..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Rg: %s Kol: %d/%d Tk: %d/%d EVR: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Regel: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Rg: %s Kol: %d/%d Tk: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Samenvoegen" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Verschil %1 van %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 verschillen gevonden" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "Eén verschil gevonden" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "AL" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecteer twee bestaande mappen of bestanden om te vergelijken" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Selectie van mappen" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecteer twee mappen of bestanden om te vergelijken." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Linker pad is ongeldig!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Rechter pad is ongeldig!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Beide paden zijn ongeldig!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Kies twee bestanden om de uitpakker selectie in te schakelen." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan geen bestand met een map vergelijken!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Bestand niet gevonden: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Bestand niet uitgepakt: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3576,7 +3583,7 @@ msgstr "" "\n" "zijn identieke binaire bestanden." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3589,7 +3596,7 @@ msgstr "" "\n" "zijn verschillende binaire bestanden." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3600,7 +3607,7 @@ msgstr "" "\n" "is een binair bestand. Kan geen binair bestand met tekstbestand vergelijken." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3613,37 +3620,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Opslaan als" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Wijzigingen opslaan in %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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 is gemarkeerd als alleen lezen. Wilt u dit alleen-lezen bestand overschrijven? (Niet opslaan onder nieuwe naam.)" -#: Merge.rc:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Fout bij het controleren van de schrijfrechten van het doelbestand" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Fout bij het maken van een veiligheidskopie" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3652,7 +3659,7 @@ msgid "" "Continue anyway?" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3667,7 +3674,7 @@ msgstr "" "%2\n" "Wilt u het bestand onder een andere naam opslaan?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3682,7 +3689,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3697,7 +3704,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3712,7 +3719,7 @@ msgstr "" "\n" "Het gewijzigde bestand overschrijven?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3721,7 +3728,7 @@ msgstr "" "%1\n" "is gemarkeerd als alleen-lezen. Wilt u het alleen-lezen item overschrijven?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3736,17 +3743,17 @@ msgstr "" "\n" "Als u de bestanden wilt verversen, sluit dan de huidige bestandsvergelijking en laad de bestanden opnieuw." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Linker bestand opslaan als" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Rechter bestand opslaan als" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3754,42 +3761,42 @@ msgid "" "Refresh documents before continuing." msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "U moet een SourceSafe project path specificeren voordat u verder kunt (bv: $/MyProject)" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Bestanden vanuit VSS uitchecken..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "SourceSafe gaf een foutmelding bij de check out van het bestand. Kan niet verder gaan..." -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Fout bij het uitvoeren van een versiebeheer systeemopdracht." -#: Merge.rc:2107 +#: Merge.rc:2110 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "De VSS werkmap en de lokatie van het huidige bestand komen niet overeen. Doorgaan?" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Geen VSS database(s) gevonden!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Fout uit VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3797,186 +3804,186 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2114 #, 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Geen" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 of lager)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 en hoger)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Geselecteerde item aan de linker kant verwijderen" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Geselecteerde item aan de rechter kant verwijderen" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Geselecteerde item(s) aan beide kanten verwijderen" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Van rechts naar links (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Van links naar rechts (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Van rechts naar links (%1 van %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Van links naar rechts (%1 van %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Van links naar... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Van rechts naar... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Van links naar... (%1 van %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Van rechts naar... (%1 van %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 of %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 of %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Selecteer doelmap" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Weet u zeker dat u alle verschillen naar het linker bestand wilt kopiëren?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Weet u zeker dat u alle verschillen naar het rechter bestand wilt kopiëren?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -3991,17 +3998,17 @@ msgstr "" "%2\n" "wilt kopiëren?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Weet u zeker dat u %1 van %2 geselecteerde item(s) wilt kopiëren?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Weet u zeker dat u %1 van %2 geselecteerde item(s) wilt verwijderen?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4013,7 +4020,7 @@ msgstr "" "%1\n" "verwijderen?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4025,17 +4032,17 @@ msgstr "" "%1\n" "wilt verwijderen?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4047,505 +4054,505 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Linker bestand openen" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Het linker bestand met de externe editor openen" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Linker bestand openen met ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Rechter bestand openen" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Het rechter bestand met de externe editor openen" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Rechter bestand openen met..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Bestandsnamen naar het klembord kopiëren" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Padnamen van de linker kant naar het klembord kopiëren" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Padnamen van de rechter kant naar het klembord kopiëren" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Padnamen van beide kanten naar het klembord kopiëren" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Onbekend archiefformaat" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Items van de linker kant aan het archief toevoegen" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Items van de rechter kant aan het archief toevoegen" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Items van beide kanten aan het archief toevoegen" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Items die verschillen (van beide kanten) aan het archief toevoegen" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Geselecteerd bestand van links naar door gebruiker gedefinieerde map verplaatsen" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Geselecteerd bestand van rechts naar door gebruiker gedefinieerde map verplaatsen" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Bestandsnaam" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Map" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Vergelijkings resultaat" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Datum links" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Datum rechts" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Grootte links" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Grootte rechts" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Aanmaaktijd links" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Aanmaaktijd rechts" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Nieuwer bestand" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Bestandsversie links" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Bestandsversie rechts" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Kort resultaat" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Attributen links" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Attributen rechts" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Tekenset links" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Tekenset rechts" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binair" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Kan bestanden niet vergelijken" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Bestand overgeslagen" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Map overgeslagen" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Binaire bestanden zijn identiek" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Binaire bestanden zijn niet gelijk" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Bestanden zijn niet gelijk" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Alleen links" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Alleen rechts" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Verstreken tijd: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 item geselecteerd" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 items geselecteerd" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Bestandsnaam of mapnaam." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Naam van submap als submappen erbij horen." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Resultaat van vergelijking, lange vorm." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Wijzigingsdatum linker zijde." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Wijzigingsdatum rechter zijde." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Bestandsextensie." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Bestandsgrootte in bytes voor linker zijde." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Bestandsgrootte in bytes voor rechter zijde." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Aanmaaktijdstip linker zijde." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Aanmaaktijdstip rechter zijde." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Geeft aan welke zijde het recentst gewijzigd is." -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bestandsversie linker zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Bestandsversie rechter zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Kort vergelijkingsresultaat." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Attributen linker zijde." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Attributen rechter zijde." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Tekenset linker zijde." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Tekenset rechter zijde." -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Toont sterretje (*) als het een binair bestand is." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "%1 met %2 vergelijken" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Hetzelfde bestand is in beide vensters geopend." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "De geselecteerde bestanden zijn identiek" -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Fout opgetreden tijdens het vergelijken van de bestanden" -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Binaire bestanden kunnen niet zichtbaar vergeleken worden." -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Tijdelijke bestanden konden niet aangemaakt worden. Controleer de instelling voor het pad van tijdelijke bestanden." -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Mapbestanden kunnen niet zichtbaar vergeleken worden." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4555,7 +4562,7 @@ msgid "" "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4563,22 +4570,22 @@ msgid "" " Do you want to change the options and preserve the different EOL ?" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4586,132 +4593,132 @@ msgid "" "Would you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Geen verschil" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Verschil binnen regel" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 tekenreeks(en) vervangen." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan tekenreeks \"%s\" niet vinden" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Volledig pad kopiëren" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Bestandsnaam kopiëren" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Patch-bestand met succes weggeschreven." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1e item niet gevonden! (is het een map?)" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2de item niet gevonden! (is het een map?)" -#: Merge.rc:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 bestanden geselecteerd]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Normaal" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Verenigd" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Kan niet schrijven naar bestand %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan geen patch-bestand maken uit binaire bestanden." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan geen patch-bestand maken uit mappen." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4719,17 +4726,17 @@ msgid "" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Huidige resultaten van mapvergelijking zullen worden gewist." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4737,51 +4744,51 @@ msgid "" "See manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4789,1117 +4796,1117 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Fout in reguliere expressie" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Geen overkomst" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Ongeldige reguliere expressie" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Ongeldig Invalid collatieteken" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Ongeldige tekenklassenaam" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Backslash aan het eind" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Ongeldige achterwaartse referentie" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Geen overeenkomende [ of [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Geen overeenkomende ( or \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Geen overeenkomende \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Ongeldige inhoud van \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Ongeldig einde van bereik" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Onvoldoende geheugen" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Ongeldige voorafgaande reguliere expressie" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Voortijdig einde van reguliere expressie" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Te grote reguliere expressie" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Geen overeenkomende ) of \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanees" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabisch (Saudie-Arabisch)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabisch (Irakees)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabisch (Egyptisch)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabisch (Libisch)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabisch (Algerijns)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabisch (Marokkaans)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabisch (Tunesisch)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabisch (Omaans)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabisch (Jemenitisch)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabisch (Syrisch)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabisch (Jordaans)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabisch (Libanees)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabisch (Kuweits)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabisch (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabisch (Bahreins)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabisch (Qatars)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armeens" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azeri (Latijns)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azeri (Cyrillisch)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Baskisch" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Wit-Russisch" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgaars" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalaans" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chinees (Traditioneel)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chinees (Eenvoudig)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chinees (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chinees (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chinees (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Kroatisch" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Tsjechisch" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Deens" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Nederlands" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Nederlands (Belgisch)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Engels (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Engels (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Engels (Australian)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Engels (Canadian)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Engels (New Zealand)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Engels (Irish)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Engels (So. African)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Engels (Jamaican)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Engels (Caribbean)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Engels (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Engels (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Engels (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Engels (Philippijnen)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Ests" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Faeröes" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Perzisch" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Fins" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Frans" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Frans (Belgisch)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Frans (Canadees)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Frans (Zwitsers)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Frans (Luxemburg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Frans (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgisch" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Duits (Germany)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Duits (Zwitsers)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Duits (Oostenrijk)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Duits (Luxemburg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Duits (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Grieks" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebreeuws" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Hongaars" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "IJslands" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesisch" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italiaans" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italiaans (Zwitsers)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japans" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Koreaans" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Koreaans (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Lets" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Litouws" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Maleisisch (Maleisië)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Maleisisch (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Noors (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Noors (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Pools" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugees" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugees (Braziliaans)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Roemeens" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russisch" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Servisch (Latijn)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Servisch (Cyrillisch)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Slowaaks" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Sloveens" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Spaans" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Spaans (Mexicaans)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Spaans (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Spaans (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Spaans (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Spaans (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Spaans (Dominicaanse Republiek)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Spaans (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Spaans (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Spaans (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Spaans (Argentinië)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Spaans (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Spaans (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Spaans (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Spaans (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Spaans (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Spaans (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Spaans (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Spaans (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Spaans (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Kenia)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Zweeds" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Zweeds (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turks" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Oekraïens" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbek (Latijn)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbek (Cyrillisch)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamees" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Het linker bestand opslaan" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Het rechter bestand opslaan" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Het linker bestand opslaan met de naam..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Het rechter bestand opslaan met de naam..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "De alleen-lezen status van het linker bestand of map wijzigen" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "De alleen-lezen status van het rechter bestand of map wijzigen" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Regeleindes naar DOS modus converteren" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Regeleindes naar UNIX modus converteren" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Regeleindes naar MAC modus converteren" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Wisselen tussen bewerkmodus en samenvoegmodus" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5908,7 +5915,7 @@ msgstr "" "Ga naar regel of verschil\n" "Ga naar (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5917,7 +5924,7 @@ msgstr "" "Programmaopties instellen\n" "Eigenschappen" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -5926,79 +5933,79 @@ msgstr "" "Beeld verversen\n" "Verversen (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6007,7 +6014,7 @@ msgstr "" "Het lettertype voor de verschilvensters selecteren\n" "Het verschil-lettertype selecteren" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6016,27 +6023,27 @@ msgstr "" "Terug naar gebruik standaard systeemlettertype voor verschilvensters \n" "Standaard lettertype" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Toont tekens witruimte" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Omschakelen verschilvenster" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Locatievenster toont overzichtsweergave van bestanden" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6045,50 +6052,50 @@ msgstr "" "De gewenste taal selecteren.\n" "Taal" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" "Show Line Diff" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6097,7 +6104,7 @@ msgstr "" "Terug naan het vorige verschil \n" "Vorige verschil (Alt+Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6106,7 +6113,7 @@ msgstr "" "Verder naar het volgende verschil \n" "Volgende verschil (Alt+Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6115,7 +6122,7 @@ msgstr "" "Naar het eerste verschil\n" "Eerste verschil (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6124,7 +6131,7 @@ msgstr "" "Naar het huidige verschil\n" "Huidige verschil (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6133,7 +6140,7 @@ msgstr "" "Naar het laatste verschil\n" "Laatste verschil (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6142,7 +6149,7 @@ msgstr "" "De geselecteerde tekst naar het rechter bestand kopiëren.\n" "Nnaar rechts kopiëren (Pijl rechts)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6151,7 +6158,7 @@ msgstr "" "De geselecteerde tekst naar het linker bestand kopiëren.\n" "Naar links kopiëren (Pijl links)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6160,7 +6167,7 @@ msgstr "" "Het verschil naar rechts kopiëren en verder naar het volgende verschil.\n" "Naar rechts kopiëren en volgende (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6169,7 +6176,7 @@ msgstr "" "Het verschil naar links kopiëren en verder naar het volgende verschil.\n" "Naar links kopiëren en volgende (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6178,7 +6185,7 @@ msgstr "" "Alle verschillen naar het rechter bestand kopiëren.\n" "Alles naar rechts kopiëren" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6187,72 +6194,72 @@ msgstr "" "Kopieer alle verschillen naar het linker bestand. \n" "Alles naar links kopiëren" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Kolommen van mapvergelijk selecteren en herordenen" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Een patch-bestand genereren" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Filters selecteren en wijzigen" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "De gebruiker selecteert de uitpakker (niet uitpakken bij het vergelijken van mappen)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "De overgenomen uitpakker wordt gebruikt voor beide bestanden (een bestand hoeft maar de extensie te hebben)" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Selecteer een uitpakker om dit bestand te wijzigen" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Geen voorvergelijking (normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Voorgestelde plug-ins" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Andere plug-ins" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Alle plug-ins opnieuw inladen (voor ontwikkelaars)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6261,12 +6268,12 @@ msgstr "" "Volgend zichtbaar bestand activeren\n" "Volgend bestand activeren" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6275,296 +6282,301 @@ msgstr "" "De WinMerge gebruikershandleiding tonen\n" "Help" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "De huidige WinMerge versie en configuratie naar een tekstbestand wegschrijven" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "De GNU publieke licentie tonen" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" "Help Index" msgstr "" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" "Help Search" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Plug-in instellingen" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Geen voorvergelijking" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Voorvergelijking indien mogelijk" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH niet gevonden - .sct scripts uitgeschakeld" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Verplaatste blokken niet weergeven" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Alle verplaatste blokken weergeven" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Alleen verplaatse blokken van huidige vergelijking weergeven" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Ga naar het verschil onder de cursor" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G&a naar verschil %1 van %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "G&a naar regel %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/French.po b/Src/Languages/French.po index f0d2668c1..5ee71da61 100644 --- a/Src/Languages/French.po +++ b/Src/Languages/French.po @@ -73,7 +73,7 @@ msgstr "&Couper" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "Co&pier" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "Co&ller" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&Atteindre..." @@ -96,43 +96,43 @@ msgid "Op&en" msgstr "&Ouvrir" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "avec l'application &désignée" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "avec l'éditeur &externe" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&avec..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Fichier" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Nouveau\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Ouvrir...\tCtrl+O" @@ -148,8 +148,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Ouvrir un &projet...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "&Enregistrer un Project..." @@ -160,1845 +160,1852 @@ msgid "Recent Projects" msgstr "Projets récents" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Quitter" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Edition" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Préférences..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Affichage" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Choisir une &police..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "&Utiliser la police par défaut" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "Barre d'&outils" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "&Aucune" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "&Petite" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "Barre d'&état" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "Barre de lo&calisation" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Langage..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Outils" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtrer..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Générer des retouches..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Plugiciels" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "Décompression &manuelle" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "Décompression &automatique" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Éditer avec décompression" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Recharger les plugiciels" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "&Déboguer" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "&Charger la configuration..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "&Initialiser les préférences" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "Fe&nêtre" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Fermer" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Fermer &tout" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Chan&ger de volet\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Mosaïque &horizontale" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Mosaïque &verticale" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Cascade" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "A&ide" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Rubriques d'aide\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Index..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "Rec&hercher..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "C&onfiguration..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "&Support d'archives disqualifié..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "&Licence GNU..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&A propos de WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Ouvrir un &projet...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Côté gauc&he lecture seulement" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Côté droi&t lecture seulement" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "Encodage de &fichier" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Sélectionner &tout\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Fichiers &identiques" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Fichiers &différents" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Fichiers uniquement à &gauche" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Fichiers uniquement à d&roite" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Fichiers ig&norés" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Fichiers &binaires" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Afficher les éléments cachés" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Comparer les &statistiques" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "Actual&iser\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualiser la &sélection\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "Fu&sionner" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparer\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Différence &suivante\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Différence &précédente\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "P&remière différence\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Différence &courante\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Dernière différence\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copier vers la dr&oite\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copier vers la ga&uche\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "Su&pprimer\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Ajuster les colonnes..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Générer un &rapport..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Enregistrer\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Enregistrer à &gauche" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Enregistrer" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Enregistrer &sous..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Enregistrer à &droite" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Imprimer..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "&Mise en page" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "&Aperçu avant impression" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Rendre au format" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "&DOS (CRLF)" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "&UNIX (LF)" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "&MAC (CR)" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Mode &Fusion\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Ann&uler\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Rétablir\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Couper\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "Co&pier\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "Co&ller\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "&Sélectionner la distinction\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Rechercher...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Re&mplacer...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "Appliquer un &script" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Vide >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "A&vancé" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copier avec des numéros de ligne\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Signets" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Placer/retirer un signet\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "Signet &suivant\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Signet &précédent\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Effacer tous les signets" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Atteindre...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Coloration de la syntaxe" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Afficher les &espaces" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Afficher la &granularité des lignes" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Afficher la &numérotation des lignes" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Afficher les &marges" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "&Retour à la ligne automatique" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "&Intervertir les fenêtres" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Dé&tail des différences" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Barre de lo&calisation" -#: Merge.rc:428 +#: Merge.rc:430 #, 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:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copier vers la gauche et Av&ancer\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Tout cop&ier vers la droite" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Tout copi&er vers la gauche" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Pré-comparer" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "Co&mparer" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "de &gauche vers la droite" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "de g&auche vers..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "de &droite vers la gauche" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "de d&roite vers..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "Dé&placer" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "de g&auche vers..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "de d&roite vers..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Supprimer" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "à &gauche" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "à &droite" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "des deu&x côtés" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "Re&nommer" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "D&issimuler l'élément(s)" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "Ouvrir à &gauche" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Ouvrir à &droite" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Copier le c&hemin complet" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "de &gauche (%1 de %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "de &droite (%1 de %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "des deu&x côtés (%1 de %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Copier le nom de &fichier" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "Co&mpresser" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "à &gauche... (%1 de %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "à &droite... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "les deu&x côtés... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "les di&fférences...(%1 de %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "&Actualiser" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "Copier le c&hemin complet" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Copier le nom de &fichier" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Ajustements de pré-comparaison" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "Au&cun" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Au&tomatique" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Atteindre la différence courante" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Ne pas afficher les blocs déplacés" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Afficher les blocs déplacés" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Afficher le bloc déplacé de la différence &courante" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "A propos de WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(Compilation personnalisée)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Tous droits réservés." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Découvrez la page d'accueil de WinMerge !" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Collaborateurs" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Sélection des fichiers ou des répertoires..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Gauche:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "P&arcourir..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Droite:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "Pa&rcourir..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Filtre:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "&Choisir..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "Décom&pres." -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "C&hoisir..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Inclure les sous-répertoires" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Statut:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Ann&uler" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Aide" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Fichiers ou répertoires à comparer :" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "&Database:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "&Projet:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Usa&ger:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "&Mot de passe:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "&Lien vers le projet destination VSS" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "&Appliquer à tous les éléments" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "E&xtraire" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Enregis. &sous" -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Contrôle de version" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Système utilisé:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Chemin vers cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Général" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Atteindre automatiquement la première différence" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Sans page de garde" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fermer les fenêtres avec la &touche ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Vérifier automatiquement les chemins de la fenêtre-Ouvrir" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "&Permetre une seule instance en exécution" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "&Confirmer la fermeture de plusieurs fenêtres" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Automatisation boîte de dialogue d'ouverture:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Qualifier plusieurs fenêtres pour" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "comparaison de Répert&oires" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "comparaison de &Fichiers" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "&Initialiser" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Langage" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Langages disponibles :" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Rechercher" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Rechercher:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "&Mot entier seulement" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Respecter la &casse" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "E&xpressions régulières" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "Pas de retour automatique à la ligne" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Direction" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "Vers le &Haut" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "Vers le &Bas" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Suivant" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Remplacer" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Rem&placer par:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "&Ne pas absorber la fin de ligne" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Portée " -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "La sé&lection" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "Tout le &fichier" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Remplacer" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "&Tout Remplacer" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "&Extraire" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Commentaires" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "Inscrire après extraction" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Filtre des lignes" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Qualifier le fitrage des lignes" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expressions régulières (une par ligne)" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Enregister" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "Nouveau" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Editer" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "Supprimer" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Couleurs" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Différence:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Différence sélectionnée :" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Fond" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Absence" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Texte" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Différence ignorée:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Déplacé:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Sélectionné et déplacé:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Mot différent:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Mot différent sélectionné:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Défauts" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Dialogue" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Système" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Envoyer les fichiers supprimés à la corbeille" -#: Merge.rc:978 +#: Merge.rc:981 #, 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:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Intégration" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Intégrer à l'explorateur Windows" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "&Qualifier le menu avancé" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "In&clure les sous-répertoires par défaut" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "E&diteur externe:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "&Répertoire de filtre:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Parc&ourir..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Générateur de retouche" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Fichier&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Fichier&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "P&arcourir..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "&Intervertir" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "A&jouter au fichier existant" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "Ré&sultat:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Contexte:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Caractères d'&espacement" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "C&omparer" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Ignorer les chan&gements" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "&Tout ignorer" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorer les lignes &vides" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Sensi&ble à la casse" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Inclure la ligne de co&mmande" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Ouvrir avec l'éditeur e&xterne" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Affichage des colonnes" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "&Monter" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "&Descendre" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Sélectionner le décompresseur" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Décompresseur:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Afficher tous les décompresseurs, ignorer les extensions" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Extensions:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Description:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "Progression de la comparaison" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Arrêter" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Comparaison des éléments..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Éléments comparés:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Éléments au total:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Atteindre" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "A&tteindre:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Fichier" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Atteindre quoi" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "&Ligne" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "Di&fférence" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Atteindre" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Comparaison" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Caractères d'espacement" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "C&omparer" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "Ignorer les chan&gements" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "&Tout ignorer" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer les lignes &vides" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignorer la ca&sse" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Ignorer les différences de &fin de ligne (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "&Qualifier la détection des blocs déplacés" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "Assortir les &lignes similaires" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "&Méthode de comparaison:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "&Arrêter à la première différence" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Filtrer les commentaires" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Éditeur" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "&Colorer la syntaxe" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "&Actualiser automatiquement" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "&Préserver les caractères de fin de ligne d'origine" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulations" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "Tai&lle des tabulations:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "Insérer &tabulation" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Insérer &espace" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Colorer les différences de ligne" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "A&fficher les différences" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "Précision au &caractère" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "Précision au &mot" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filtre des fichiers" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Installer..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "&Nouveau..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "É&diter..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "&Supprimer..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Enregister les fichiers modifiés ?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Fichier du côté gauche" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Enregister les changements" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Ignorer les changements" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Fichier du côté droit" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "E&nregister les changements" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "I&gnorer les changements" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Tout ignorer" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Page de code" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Page de code par défaut" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2008,32 +2015,32 @@ msgstr "" ".html, .rc, .xml \n" "nécessite un redémarrage de session" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Page de code &système" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Conformément à l'&interface usager WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Page de code sti&pulée :" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Support pour archives disqualifié" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Aucune détection du logiciel 7-Zip. Est-il installé ? " -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2042,12 +2049,12 @@ msgstr "" "Le support pour archives nécessite que 7-Zip 3.11 ou supérieur soit installé. \n" "Ou, à défaut ces composants essentiels au même répertoire que ce programme." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "De plus l'interface plugiciel appropriée (Merge7z*.dll) doit être présente." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2056,12 +2063,12 @@ msgstr "" "Veuillez utiliser la version 7-Zip recommandée plus bas jusqu'à \n" "ce qu'une interface plugiciel plus récente devienne disponible." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Version" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2070,54 +2077,54 @@ msgstr "" "plugiciel requis\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Version recommandée de 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "présente" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Logiciel 7-Zip installé sur cet ordinateur:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "absent" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "absent" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Composants solitaires de 7-Zip:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "périmé" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Plugiciel sur le chemin principal:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2126,486 +2133,486 @@ msgstr "" "Ne plus afficher ce &message.\n" "(Il peut toujours être réactiver au menu des préférences.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Téléchar. plugiciel" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Préférences" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Catégories" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Importer..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Exporter..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Mots clés:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Nom des Fonctions:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Commentaires:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Nombres:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Opérateurs:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Chaines:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Préprocesseur:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Usager 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Usager 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Surbrillance" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Répertoire du rapport de comparaison" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "Fichier du &rapport:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Style:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Copier au presse-papiers" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Filtre partagé ou privé" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Quel type de filtre voulez-vous créer ?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtre partagé (pour tous les usagers de l'odinateur)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtre privé (pour l'usager actuel seulement)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Support d'archives" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Le support d'archives nécessite l'installation du plugiciel 7-Zip:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Télécharger le plugiciel 7-zip" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Qualifier le support d'archives" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Utiliser le mode autonome de 7-Zip si disponible" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&tiliser les composants locaux de 7-Zip (répertoire WinMerge)" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Détecter le type d'archives avec un fichier de signature" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Statistiques de comparaison" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Répertoires:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Fichiers:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Différent" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Texte:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binaire:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Unique" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Gauche:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Droit:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identique" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Fermer" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Affectations" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Affecté)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Sélectionner le code de page" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&Chargement de fichier:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "&Enregistrement de fichier:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&Utiliser le même pour les deux" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "&Appliquer" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "Ann&uler" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Filtre de test" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Tester le filtre ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Saisir le texte à tester:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Nom de répertoire" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "&Tester" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Fermer" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&Utiliser les couleurs de texte ajustées" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Couleurs de texte ajustées" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Caractère espace:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Texte régulier:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Sélection:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Chemins" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Lecture seule" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Lecture seule" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Ouvrir..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Enregistrer..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Fichiers d'archive" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Créer les fichiers d'archive sous:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Créer les fichiers d'archive dans:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "&Répertoire d'&origine du fichier" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "Répertoire d'archive &global:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "&Nom du fichier d'archive:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "Apposer une &extension .bak" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "Apposer une estampille &temporelle" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "Confirmation de copie" -#: Merge.rc:1625 +#: Merge.rc:1628 #, 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:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "De la gauche" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "Vers la droite" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Oui" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "Non" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "040c04e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Traduit par Gil Andre, poursuivi par Laurent Ganier et Jean-François Jolin" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x40c, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Prêt" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "MAJ" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2614,7 +2621,7 @@ msgstr "" "Création de documents vides\n" "Nouveau (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2623,7 +2630,7 @@ msgstr "" "Ouvrir la fenêtre du choix des sélections\n" "Ouvrir (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2632,7 +2639,7 @@ msgstr "" "Ferme la fenêtre active\n" "Fermer" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2641,7 +2648,7 @@ msgstr "" "Enregistre le fichier actif\n" "Enregistrer (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2650,7 +2657,7 @@ msgstr "" "Enregistre le fichier actif sous un nouveau nom\n" "Enregistrer sous" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2659,7 +2666,7 @@ msgstr "" "Change les options d'impression\n" "Mise en page" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2668,7 +2675,7 @@ msgstr "" "Change les options d'imprimante et d'impression\n" "Configuration de l'impression" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2677,7 +2684,7 @@ msgstr "" "Imprime le document actif\n" "Imprimer" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2686,12 +2693,12 @@ msgstr "" "Affiche les pages entières\n" "Aperçu avant impression" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Rendre visible à nouveau tous les éléments cachés" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2700,32 +2707,32 @@ msgstr "" "Ouvrir un fichier de projet\n" "Fichier de projet (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erreur indéterminée lors de l'ouverture du projet" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erreur indéterminée lors de l'enregistrement du projet" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Fichiers du projet" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Fichiers du projet correctement chargés." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Fichiers du projet correctement enregistrés." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2734,7 +2741,7 @@ msgstr "" "Enregistrer les chemins et préférences au projet\n" "Enregistrer les fichiers du projet" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2743,7 +2750,7 @@ msgstr "" "Affiche des informations sur le programme, le numéro de version et le copyright\n" "A propos de" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2752,9 +2759,6 @@ msgstr "" "Ferme l'application et propose d'enregistrer les documents\n" "Quitter" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2768,11 +2772,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Ouvrir ce document" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2781,7 +2788,7 @@ msgstr "" "Passe au volet suivant\n" "Volet suivant" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2790,7 +2797,7 @@ msgstr "" "Revient au volet précédent\n" "Volet précédent" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2799,7 +2806,7 @@ msgstr "" "Ouvre une nouvelle fenêtre pour le document actif\n" "Nouvelle fenêtre" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2808,7 +2815,7 @@ msgstr "" "Réorganise les icônes au bas de la fenêtre\n" "Réorganise les icônes" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2817,7 +2824,7 @@ msgstr "" "Réorganise les fenêtres en cascade\n" "Cascade" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2826,7 +2833,7 @@ msgstr "" "Réorganise les fenêtres en une mosaïque horizontale\n" "Mosaïque horizontale" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2835,7 +2842,7 @@ msgstr "" "Réorganise les fenêtres en une mosaïque verticale\n" "Mosaïque verticale" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2844,7 +2851,7 @@ msgstr "" "Fractionne la fenêtre active en deux volets\n" "Fractionner" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2853,7 +2860,7 @@ msgstr "" "Efface la sélection\n" "Effacer" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2862,7 +2869,7 @@ msgstr "" "Efface tout\n" "Effacer tout" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2871,7 +2878,7 @@ msgstr "" "Copie la sélection et la place dans le presse-papiers\n" "Copier" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2880,7 +2887,7 @@ msgstr "" "Supprime la sélection et la place dans le presse-papiers\n" "Copier" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2889,7 +2896,7 @@ msgstr "" "Recherche le texte spécifié\n" "Rechercher" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2898,7 +2905,7 @@ msgstr "" "Insère le contenu du presse-papiers\n" "Coller" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2907,7 +2914,7 @@ msgstr "" "Répète la dernière action\n" "Répéter" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2916,7 +2923,7 @@ msgstr "" "Remplace le texte spécifique par un texte différent\n" "Remplacer" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2925,7 +2932,7 @@ msgstr "" "Sélectionne le document entier\n" "Sélectionner tout" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2934,7 +2941,7 @@ msgstr "" "Annule la dernière action\n" "Annuler" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2943,7 +2950,7 @@ msgstr "" "Rétablit l'action précédemment annulée\n" "Rétablir" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2952,7 +2959,7 @@ msgstr "" "Affiche ou masque la barre d'outils\n" "Barre d'outils" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2961,7 +2968,7 @@ msgstr "" "Affiche ou masque la barre d'état\n" "Barre d'état" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2970,62 +2977,62 @@ msgstr "" "Affiche ou masque la barre d'onglet\n" "Barre d'onglet" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Change la taille de la fenêtre" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Change la position de la fenêtre" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Réduit la fenêtre en icône" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Agrandit la fenêtre au format de l'écran" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Passe à la fenêtre du document suivant" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Passe à la fenêtre du document précédent" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Ferme la fenêtre active et propose l'enregistrement des documents" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Restaure la fenêtre à sa taille d'origine" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Active la liste des tâches" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Active cette fenêtre" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3034,7 +3041,7 @@ msgstr "" "Ferme le mode d'aperçu avant impression\n" "Fermer l'aperçu" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3053,23 +3060,23 @@ msgstr "" "WinMerge.Document\n" "Document WinMerge" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Conserver les caractères de fin de ligne d'origine" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Appuyer sur une touche" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Clic droit pour copier le chemin" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3078,152 +3085,152 @@ msgstr "" "Développeurs:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 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 license publique GNU au menu d'aide pour tous les détails." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Avorter" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Réessayer" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "&Tout ignorer" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Oui" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Oui pour &tout" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Non" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Non pour t&out" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Continuer" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Sauter" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "To&ut sauter" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Ne plus afficher ce &message." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Ne plus poser cette &question." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Couleurs de la syntaxe" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Couleurs du texte" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Contrôle de version" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "Vers:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "De la gauche:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "Vers la gauche:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "De la droite:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "Vers la droite:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Version %1 - Français" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Préférences (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Tous les messages seront réaffichés." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Certains fichiers de la session courante ont été modifiés. Les changements de préférences seront en vigueur lors de la prochaine comparaison de fichier." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Le changement de police sera en vigueur lors de la prochaine comparaison de fichier." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3234,7 +3241,7 @@ msgstr "" "\n" "Veuillez utiliser ces valeurs 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3245,107 +3252,107 @@ msgstr "" "\n" "Veuillez redémarrer WinMerge après l'initialisation." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Ouvrir" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmes|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tous les fichiers (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fichiers de projet WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fichiers d'options (*.ini)|*.ini|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fichiers HTML (*.htm,*.html)|*.htm;*.html|Tous les fichiers(*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fichiers XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Contenu complet" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Contenu rapide" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Date de modification" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Date et taille modifiée" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Taille" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Nom" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Emplacement" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtres" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Description" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Sélectionner un nom de fichier pour le nouveau filtre" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtres de fichier (*.flt)|*.flt|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3358,7 +3365,7 @@ msgstr "" "Veuillez copier le fichier %1 dans WinMerge/Répertoire des filtres:\n" "%2." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3371,7 +3378,7 @@ msgstr "" "\n" "Veuillez vous assurer de l'existance du répertore et qu'il soit inscriptible." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3382,7 +3389,7 @@ msgstr "" "\n" "Veuillez le définir sous Préférences/Système." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3395,12 +3402,12 @@ msgstr "" "\n" "Cause probable: fichier en lecture seule?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Localiser le fichier de filtre à installer" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3411,208 +3418,208 @@ msgstr "" "\n" "Ne peut copier le nouveau fichier de filtre au répertoire de filtre." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Le fichier de filtre existe déjà. Écraser le filtre existant?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Expression régulière" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Chemin vers cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Chemin vers SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Résultats de la comparaison des répertoires" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Comparaison de fichiers" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Sans titre à gauche" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Sans titre à droite" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Balayage des fichiers en cours..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Ouverture en cours..." -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Copie de gauche à droite en cours..." -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Copie de droite à gauche en cours..." -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Copie de tout vers la gauche en cours..." -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Copie de tout vers la droite en cours..." -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Copie des fichiers en cours..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Suppression des fichiers en cours..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Déplacement des fichiers en cours..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Création du rapport..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Lg: %s Col: %d/%d Car: %d/%d EOL: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Ligne: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Lg: %s Col: %d/%d Car: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Fusion" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Différence %1 de %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 Différences trouvées" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 Différence trouvée" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "LS" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Élément %1 de %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Élément: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Comparez deux fichiers ou deux répertoires !" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Sélection de répertoire" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Sélectionner deux répertoires ou deux fichiers à comparer" -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Le chemin de gauche est invalide !" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Le chemin de droite est invalide !" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Les deux chemins sont invalides !" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Choisissez deux fichiers pour qualifier la sélection du décompresseur." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne peut comparer un fichier et un répertoire !" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Fichier %1 non trouvé" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Fichier non décompressé : %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3625,7 +3632,7 @@ msgstr "" "\n" "sont des fichiers binaires identiques." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3638,7 +3645,7 @@ msgstr "" "\n" "sont des fichiers binaires différents." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3649,7 +3656,7 @@ msgstr "" "\n" "est un fichier binaire. Ne peut comparer un fichier texte et un fichier binaire." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3662,37 +3669,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Enregistrer sous" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Enregistrer les changements de %1 ?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Erreur en vérifiant les droits en écriture de la destination" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Erreur lors du backup du fichier" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3705,7 +3712,7 @@ msgstr "" "\n" "Continuer quand même ?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3722,7 +3729,7 @@ msgstr "" "\t-utiliser un nom autre nom de fichier (Ok)\n" "\t-avorter l'opération en cours (Annuler)?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3737,7 +3744,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3752,7 +3759,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3767,7 +3774,7 @@ msgstr "" "\n" "Voulez-vous écraser le fichier mis à jour ?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3776,7 +3783,7 @@ msgstr "" "%1\n" "est en lecture seule. Voulez-vous outrepasser ?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3791,17 +3798,17 @@ msgstr "" "\n" "Pour tenir compte des changements terminez la présente comparaison et en débuter une nouvelle." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Enregistrer le fichier de gauche sous" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Enregistrer le fichier de droite sous" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3812,42 +3819,42 @@ msgstr "" "\n" "Actualiser les documents avant de poursuivre." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Extraire les fichiers de VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, 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:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Aucune base de données de VSS trouvée !" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Erreur de VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3858,7 +3865,7 @@ msgstr "" " Veuillez vérifier la configuration.\n" " Annuler l'operation d'extraction?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3867,179 +3874,179 @@ 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Aucun" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inférieur à 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 et supérieur)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Distinguer sur espacement" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Distinguer sur espacement ou ponctuation" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Copier le fichier sélectionné vers le répertoire indentifié" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Copier le fichier sélectionné vers un répertoire à indentifer" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Supprimer l'élément sélectionné à gauche" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Supprimer l'élément sélectionné à droite" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Supprimer l'élément sélectionné de chaque côté" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Dissimuler l'élément sélectionné (filtre instantané)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Renommer l'élément sélectionné de chaque côté" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "De droite à gauche (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "De gauche à droite (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "De droite à gauche (%1 de %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "De gauche à droite (%1 de %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "De gauche vers... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "De droite vers... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "De gauche vers... (%1 de %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "De droite vers... (%1 de %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "À gauche (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "À droite (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Des deux côtés (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "À gauche (%1 de %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "À droite (%1 de %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Des deux côtés (%1 de %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Choisir un répertoire de destination" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Côté gauche - choisir répertoire de destination:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Côté droit - choisir répertoire de destination:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Fichiers modifiés)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Fichiers modifiés)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Voulez-vous vraiment copier toutes les différences vers le fichier gauche ?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Voulez-vous vraiment copier toutes les différences vers le fichier droit ?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4054,17 +4061,17 @@ msgstr "" "vers\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Voulez-vous vraiment copier %1 élément(s) sélectionné(s) parmi %2 ?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Voulez-vous vraiment supprimer %1 élément(s) sélectionné(s) parmi %2 ?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4075,7 +4082,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4086,17 +4093,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Voulez-vous vraiment copier:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Voulez-vous vraiment copier %d éléments:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4115,458 +4122,458 @@ msgstr "" "\n" "Veuillez actualiser la comparaison." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Ouvrir le fichier de gauche" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Ouvrir le fichier de gauche avec l'éditeur externe" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Ouvrir le fichier de gauche avec ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Ouvrir le fichier de droite" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Ouvrir le fichier de droite avec l'éditeur externe" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Ouvrir le fichier de droite avec ..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Lancement de l'éditeur externe a échoué: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Extension inconnue pour l'éditeur externe: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Copier les fichiers vers le presse-papiers" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copier les chemins de gauche vers le presse-papiers" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copier les chemins de droite vers le presse-papiers" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copier les chemins des deux côtés vers le presse-papiers" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Format d'archives inconnu" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Ajouter les éléments du côté gauche au fichier d'archives" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Ajouter les éléments du côté droit au fichier d'archives" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Ajouter les éléments des deux côté au fichier d'archives" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Ajouter les éléments distincts des deux côté au fichier d'archives" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Déplacer le fichier sélectionné de gauche vers un répertoire à indentifer" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Déplacer le fichier sélectionné de droite vers un répertoire à indentifer" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Nom du fichier" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Répertoire" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Résultat de la comparaison" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Date mod. gauche" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Date mod. droite" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Extension" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Taille gauche" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Taille droite" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Taille droite (abrégée)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Taille gauche (abrégée)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Date cré. gauche" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Date cré. droit" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Plus récent" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Version gauche" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Version droite" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Résultat" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Attributs gauches" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Attributs droits" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Fin de ligne gauche" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Fin de ligne droit" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Page de code gauche" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Page de code droite" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Différences ignorées." -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Différences" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binaire" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Impossible de comparer les fichiers" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Élément abandonné" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Fichier ignoré" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Répertoire ignoré" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Juste à gauche: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Juste à droite: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Les fichiers binaires sont identiques" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Les fichiers binaires sont différents" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Les fichiers sont différents" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Juste à gauche" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Juste à droite" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "Erreur" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps écoulé: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 élément sélectionné" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 éléments sélectionnés" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Nom de fichier ou de répertoire." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom du sous-répertoire lorsque ceux-ci sont inclus." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparison, format étendu." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Date de modification du côté gauche." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Date de modification du côté droit." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Extension du fichier." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Taille du fichier du côté gauche en octets." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Taille du fichier du côté droit en octets." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Taille du fichier du côté gauche abrégée." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Taille du fichier du côté droit abrégée." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Temps de creation du côté gauche." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Temps de creation du côté droit." -#: Merge.rc:2300 +#: Merge.rc:2303 #, 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:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Version du fichier du côté gauche, certains fichiers seulement." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Version du fichier du côté droit, certains fichiers seulement." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Resultat de la comparison, format abrégé." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Attributs du côté gauche." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Attributs du côté droit." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Type de fin de ligne du côté gauche" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Type de fin de ligne du côté droit" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Page de code du côté gauche." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Page de code du côté droit." -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Indique un astérisque (*) si le fichier est binaire." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Comparer %1 avec %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Liste délimitée par des virgules" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Liste délimitée par des tabulations" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "Format HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "Format XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4575,47 +4582,47 @@ msgstr "" "Erreur à la création du rapport:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Le rapport a été créé avec succès." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Le même fichier est ouvert dans les deux volets." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Les fichiers sélectionnés sont identiques." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Le fichier sélectionné n'existe pas dans les deux répertoires et ne peut donc pas être comparé." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Erreur lors de la comparaison des fichiers." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Les fichiers binaires ne peuvent être visuellement comparés" -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Les répertoires ne peuvent pas être comparés de manière visuelle." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4630,7 +4637,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4641,22 +4648,22 @@ msgstr "" " Selon les préférences en vigueur, elles seront uniformisées au type principal.\n" " Désirez-vous changer l'option et préserver les différences ?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Une erreur est survenue pendant la pré-comparaison du fichier '%1' avec le plugiciel '%2'. La pré-comparaison ne sera donc plus utilisée." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Le répertoire sélectionné est invalide." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne peut ouvrir un fichier binaire avec l'éditeur." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4667,132 +4674,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Attention! Les fichiers utilisent un encodage différent: gauche=%s , droit=%s et la fusion peut conduire à une perte d'information." -#: Merge.rc:2356 +#: Merge.rc:2359 #, 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:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Information perdue à cause d'erreurs d'encodage: fichier de droite" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Information perdue à cause d'erreurs d'encodage: fichier de gauche" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Aucune différence" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Ligne différente" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 remplacement(s) effectué(s)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "texte non trouvé \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Copier le chemin complet" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Copier le nom du fichier" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Barre de localisation" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Détail des différences" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Fichier de retouche écrit avec succès." -#: Merge.rc:2393 +#: Merge.rc:2396 #, 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:2394 +#: Merge.rc:2397 #, 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:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 fichiers sélectionnés]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Contexte" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Unifié" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Ne peut écrire au fichier %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, 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:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Indiquez un fichier de sortie" -#: Merge.rc:2403 +#: Merge.rc:2406 #, 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:2404 +#: Merge.rc:2407 #, 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:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4803,17 +4810,17 @@ msgstr "" "\n" "Générer une retouche requiert l'état non modifié des fichiers." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Le répertoire n'existe pas." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Les résultats de comparaison du répertoire courant seront effacés." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4824,7 +4831,7 @@ 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 le qualifier." -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4833,7 +4840,7 @@ msgstr "" "\n" "Note: l'intégration de 7-Zip est disqualifiée avec les préférences de WinMerge." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4842,37 +4849,37 @@ msgstr "" "\n" "Note: l'intégration de 7-Zip est restreinte au mode autonome avec les préférences de WinMerge." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Sélectionner le fichier pour exportation" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Sélectionner le fichier pour importation" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Préférences importées du fichier." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Préférences exportées au fichier." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "L'importation (lecture) du fichier des préférences a échoué." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "L'exportation (écriture) du fichier des préférences a échoué." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4883,1098 +4890,1098 @@ msgstr "" "\n" "Voulez-vous continuer ?" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Erreur d'expression régulière" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Pas de concordance" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Expression régulière invalide" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Comparaison de caractère invalide" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Nom de classe de caractère invalide" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Barre oblique à la fin" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Reférence arrière invalide" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Non concordance de [ ou [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Non concordance de ( ou \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Non concordance de \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Contenu invalide de \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Fin de l'intervalle invalide" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Mémoire insuffisante" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Expression régulière précédente invalide" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Fin prématurée d'expression régulière" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Expression régulière trop grande" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Non concordance de ) or \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Africain" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanais" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabe (Arabie Saoudite)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabe (Iraquien)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabe (Égyptien)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabe (Libyen)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabe (Algérien)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabe (Marocain)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabe (Tunisien)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabe (Omanien)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabe (Yéménien)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabe (Syrien)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabe (Jordanien)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabe (Libanais)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabe (Koweïtien)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabe (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabe (Bahreïnien)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabe (Qatarien)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Arménien" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azeri (Latin)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azeri (Cyrillique)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Basque" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Biélorusse" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgare" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalan" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chinois (Traditionnel)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chinois (Simplifié)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chinois (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chinois (Singapour)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chinois (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Croate" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Tchèque" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Danois" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Néerlandais" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Néerlandais (Belgique)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Anglais (Américain)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Anglais (Britannique)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Anglais (Australien)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Anglais (Canadien)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Anglais (Néo-Zélandais)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Anglais (Irlandais)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Anglais (Sud Africain)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Anglais (Jamaïquain)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Anglais (Caraïbe)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Anglais (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Anglais (Trinité et Tobago)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Anglais (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Anglais (Philippin)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Estonien" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Féroen" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Perse" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Finnois" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Français" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Français (Belgique)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Français (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Français (Suisse)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Français (Luxembourg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Français (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Géorgien" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Allemand (Allemagne)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Allemand (Suisse)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Allemand (Autriche)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Allemand (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Allemand (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Grec" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hébreu" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Hindi" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Hongrois" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Islandais" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesien" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italien" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italien (Suisse)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japonais" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmiri (Inde)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Kazakh" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Coréen" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Coréen (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Letton" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lithuanien" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malais (Malaisie)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malais (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "Manipuri" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norvégien (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norvégien (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polonais" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugais" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugais (Brésil)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Roumain" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russe" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sanskrit" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbe (Latin)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbe (Cyrillique)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "Sindhi" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Slovaque" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Slovène" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Espagnol" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Espagnol (Mexicain)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Espagnol (Moderne)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Espagnol (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Espagnol (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Espagnol (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Espagnol (Dominicain)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Espagnol (Venezuelien)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Espagnol (Colombien)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Espagnol (Peruvien)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Espagnol (Argentine)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Espagnol (Equateur)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Espagnol (Chili)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Espagnol (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Espagnol (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Espagnol (Bolivie)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Espagnol (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Espagnol (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Espagnol (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Espagnol (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Kenya)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Suédois" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Suédois (Finlande)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tamoul" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatar (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Thaï" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turc" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ukrainien" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "Urdu (Pakistan)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (Inde)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbek (Latin)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbek (Cyrillique)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamien" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Europe de l'ouest" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Europe de l'est" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Asie de l'est" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "Asie du SE & SO" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Moyen orient" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Non applicable" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillique" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabe" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grec" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltique Rim" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grec 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillique" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turc" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugais" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandais" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hébreu" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Français (Canada)" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordique" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillique CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grec 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Thaï" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japonais" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chinois (Simplifié)" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Coréen" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chinois (Traditionnel)" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillique (Slovaque)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Grec" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turquie)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hébreu" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Arabe" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltique Rim" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamien" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romain" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grec" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillique" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europe Centrale" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turc" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Se rapproche de ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Se rapproche de ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Se rapproche de ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Se rapproche de ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Se rapproche de ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Combiné" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " O" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " KO" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr " MO" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr " GO" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr " TO" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr " PO" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Enregistrer le fichier de gauche" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Enregistrer le fichier de droite" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Enregistrer le fichier de gauche sous..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Enregistrer le fichier de droite sous..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Restreindre ou permettre l'écriture du côté droit" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Restreindre ou permettre l'écriture du côté gauche" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Convertir la fin de ligne en mode DOS" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Convertir la fin de ligne en mode UNIX" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Convertir la fin de ligne en mode MAC" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Basculer entre les modes d'édition et de fusion" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5983,12 +5990,12 @@ msgstr "" "Voir et ajuster les propriétés d'encodage de fichier\n" "Propriétés d'encodage de fichier" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5997,7 +6004,7 @@ msgstr "" "Sélectionner la différence de la ligne courante\n" "Différence de la ligne courante" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6006,7 +6013,7 @@ msgstr "" "Atteindre une ligne ou une différence\n" "Atteindre (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6015,7 +6022,7 @@ msgstr "" "Modifier les préférences du programme\n" "Préférences" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6024,37 +6031,37 @@ msgstr "" "Actualiser l'affichage\n" "Actualiser (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copier les lignes sélectionnés vers le presse-papiers en les précédants d'un numéro de ligne" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Actualiser les éléments sélectionnés" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Placer ou retirer un signet" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Atteindre le signet suivant" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Atteindre le signet précédent" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Effacer tous les signets" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6063,7 +6070,7 @@ msgstr "" "Afficher les éléments strictement identiques\n" "Afficher les éléments identiques" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6072,7 +6079,7 @@ msgstr "" "Afficher les éléments comportants des différences\n" "Afficher les éléments différents" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6081,7 +6088,7 @@ msgstr "" "Afficher les éléments existant seulement au côté gauche\n" "Afficher les éléments de gauche seulement" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6090,7 +6097,7 @@ msgstr "" "Afficher les éléments existant seulement au côté droit\n" "Afficher les éléments de droite seulement" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6099,7 +6106,7 @@ msgstr "" "Afficher les éléments binaires\n" "Afficher les éléments binaires" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6108,7 +6115,7 @@ msgstr "" "Afficher les éléments ignorés\n" "Afficher les éléments ignorés" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6117,7 +6124,7 @@ msgstr "" "Sélectionner la police utilisée pour l'affichage des différences\n" "Sélection de la Police Diff" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6126,27 +6133,27 @@ msgstr "" "Revenir à la police par défaut pour l'affichage des différences\n" "Police par Défaut" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Afficher ou masquer les espaces" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Afficher ou masquer le détail des différences courantes" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Afficher ou masquer la barre de localisation (vue d'ensemble des fichiers)" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Afficher la boîte de dialogue de comparaison des statistiques" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6155,7 +6162,7 @@ msgstr "" "Sélectionner le langage de l'interface\n" "Langage" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6164,12 +6171,12 @@ msgstr "" "Afficher les différences des lignes avec différentes couleurs\n" "Afficher différences des lignes" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Intervertir la position de deux fenêtres" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6178,7 +6185,7 @@ msgstr "" "Afficher la numérotation des lignes\n" "Afficher la numérotation des lignes" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6187,7 +6194,7 @@ msgstr "" "Afficher ou masquer le retour à la ligne automatique\n" "Retour à la ligne automatique" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6196,17 +6203,17 @@ msgstr "" "Afficher les marges des deux fenêtres\n" "Afficher les marges" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6215,7 +6222,7 @@ msgstr "" "Atteindre la différence précédente\n" "Diff Précédente (Alt Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6224,7 +6231,7 @@ msgstr "" "Atteindre la différence suivante\n" "Diff Suivante (Alt Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6233,7 +6240,7 @@ msgstr "" "Atteindre la première différence\n" "Première Diff (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6242,7 +6249,7 @@ msgstr "" "Atteindre la différence courante\n" "Diff Courante (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6251,7 +6258,7 @@ msgstr "" "Atteindre la dernière différence\n" "Dernière Diff (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6260,7 +6267,7 @@ msgstr "" "Copier le texte sélectionné vers le fichier de droite\n" "Copier à Droite (Alt Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6269,7 +6276,7 @@ msgstr "" "Copier le texte sélectionné vers le fichier de gauche\n" "Copier à Gauche (Alt Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6278,7 +6285,7 @@ msgstr "" "Copier la différence vers la droite et Avancer\n" "Copier vers la droite et Avancer (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6287,7 +6294,7 @@ msgstr "" "Copier la différence vers la gauche et Avancer\n" "Copier vers la gauche et Avancer (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6296,7 +6303,7 @@ msgstr "" "Copier toutes les différences vers le fichier de droite\n" "Copier Tout à Droite" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6305,72 +6312,72 @@ msgstr "" "Copier toutes les différences vers le fichier de gauche\n" "Copier Tout à Gauche" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Détruire les éléments sélectionnés pour les deux répertoires" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparer l'élément sélectionné (premier élément retenu si sélection multiple)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Sélectionner et ordonner les colonnes de la fenêtre de comparaison des répertoires" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Générer un fichier de retouche" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Sélectionner et modifier les filtres" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Générer un rapport des résultats de la comparaison" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Choisir le décompresseur (pas de décompression lors de la comparaison des répertoires)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Choisir le décompresseur pour éditer ce fichier" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Pas de pré-comparaison (normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Plugiciels suggérés" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Plugiciels autres" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Recharger tous les plugiciels (pour les développeurs)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6379,12 +6386,12 @@ msgstr "" "Basculer vers l'autre volet\n" "Active l'autre volet" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Fermer toutes les fenêtres" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6393,22 +6400,22 @@ msgstr "" "Affiche la rubrique d'aide de WinMerge\n" "Aide" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Affiche les informations de version et de configuration de WinMerge avec un fichier de texte" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Afficher la licence GNU avec le fureteur" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Compilation personnelle: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6417,7 +6424,7 @@ msgstr "" "Ouvre l'index de l'aide de WinMerge\n" "Index de l'aide" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6426,267 +6433,272 @@ msgstr "" "Ouvre la recherche de l'aide de WinMerge\n" "Recherche de l'aide" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Ajuster les plugiciels" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Pas de pré-comparaison" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Pré-comparer si possible" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH pas trouvé - .sct les scripts sont disqualifiés" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Ouvrir le fichier avec l'application désignée" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Ouvrir le fichier avec l'éditeur externe" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Ouvrir le fichier avec le programme indiqué" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Ne pas afficher les blocs déplacés" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Afficher tous les blocs déplacés" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Afficher le bloc déplacé de la différence courante" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Atteindre l'endroit pointé à la barre de localisation" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Atteindre la différence %1 de %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "Atteindre la ligne %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Disqualifié" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "A partir du système de fichier" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "A partir de la liste des fichiers récents" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Cacher la barre d'outils" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Afficher la petite barre d'outils" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Afficher la grande barre d'outils" diff --git a/Src/Languages/German.po b/Src/Languages/German.po index c70ab75bf..21cbf1739 100644 --- a/Src/Languages/German.po +++ b/Src/Languages/German.po @@ -73,7 +73,7 @@ msgstr "Auss&chneiden" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Kopieren" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "E&infügen" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&Gehe nach..." @@ -96,43 +96,43 @@ msgid "Op&en" msgstr "Ö&ffnen" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "Mit ®istrierter Anwendung" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "Mit &externem Editor" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&Mit..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Datei" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Neu\tStrg+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "Ö&ffnen...\tStrg+O" @@ -148,8 +148,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Projekt öffnen...\tStrg+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Proje&kt speichern..." @@ -160,1847 +160,1854 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Beenden" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Bearbeiten" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Einstellungen..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Ansicht" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Schrift &auswählen..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Standard-Schrift &verwenden" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "&Symbolleiste" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "&Keine" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "K&lein" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Groß" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "S&tatusleiste" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "Ta&b-Leiste" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "Spra&che..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Tools" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filter..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Patch generieren..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "&Manuell entpacken" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisch entpacken" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "Mit Entpacker &bearbeiten" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "Plugins &neu laden" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Fenster" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Schließen" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Alle s&chließen" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "&Ausschnitt wechseln\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "&Untereinander" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "&Nebeneinander" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "Über&lappend" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Hilfe" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Inhalt...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "I&ndex..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Suchen..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "&Konfiguration..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "&Archiv-Unterstützung deaktiviert..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "&GNU Public Lizenz..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "Ü&ber WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Pro&jekt öffnen...\tStrg+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "L&inks schreibgeschützt" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "R&echts schreibgeschützt" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "Dateik&odierung" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Alles &markieren\tStrg+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "&Identische Objekte anzeigen" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "&Unterschiedliche Objekte anzeigen" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Eindeutige Objekte &links anzeigen" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Eindeutige Objekte &rechts anzeigen" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Übersprun&gene Objekte anzeigen" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Binär&dateien anzeigen" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Verstec&kte Objekte anzeigen" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "V&ergleichsstatistik" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Aktualisieren\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Ausge&wählte aktualisieren\tStrg+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Merge" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Ver&gleichen\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nächster Unterschied\tAlt+Runter" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Voriger Unterschied\tAlt+Hoch" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Erster Unterschied\tAlt+Pos1" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktueller Unterschied\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Letzter Unterschied\tAlt+Ende" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Nach &rechts kopieren\tAlt+Rechts" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Nach l&inks kopieren\tAlt+Links" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "Lös&chen\tEntf" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Spalten anpassen..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "&Bericht generieren..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Speichern\tStrg+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "&Links speichern" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Speichern" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Speichern &unter..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "&Rechts speichern" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Drucken..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "Sei&te einrichten" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "Druck&vorschau" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Zeilenenden konvertieren nach" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "&Merge Modus\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Rückgängig\tStrg+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Wiederherstellen\tStrg+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Auss&chneiden\tStrg+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopieren\tStrg+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "E&infügen\tStrg+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Zeilen&unterschied markieren\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Suchen...\tStrg+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Erse&tzen...\tStrg+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "Skri&pte" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Leer >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Erweitert" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopieren mit Zeilennummern\tStrg+Umschalt+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Lesezeichen" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Lesezeichen ein/aus\tStrg+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nächstes Lesezeichen\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Vorheriges Lesezeichen\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Alle Lesezeichen löschen" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gehe nach...\tStrg+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Leer&zeichen anzeigen" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Zeilenuntersc&hiede anzeigen" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Zeilennu&mmern anzeigen" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "&Ränder anzeigen" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "Zeilen &umbrechen" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "Ausschnitt v&ertauschen" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "U&nterschiedsleiste" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "P&ositionsleiste" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Nach rechts kopieren und &fortschreiten\tAlt+Strg+Rechts" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Nach links kopieren und f&ortschreiten\tAlt+Strg+Links" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Alles nach rec&hts kopieren" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Alles nach lin&ks kopieren" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "Ver&gleichen" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&Links nach Rechts" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "L&inks nach ..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "&Rechts nach Links" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "R&echts nach ..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Verschieben" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Links nach..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&Rechts nach..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Löschen" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Links" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Rechts" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Beide" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "&Umbenennen" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "Objekte v&erstecken" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "Ö&ffne links" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Öff&ne rechts" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiere &Pfade" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Links (%1 von %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Rechts (%1 von %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Beide (%1 von %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Kopiere &Dateinamen" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "P&acken" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Links... (%1 von %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Rechts... (%1 von %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Beide... (%1 von %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Unterschiede... (%1 von %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "Ak&tualisieren" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "&Kopiere vollständigen Pfad" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Kopiere &Dateiname" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "&Prediffer Einstellungen" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Kein Prediffer" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "&Auto Prediffer" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "G&ehe nach Unterschied" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Keine verschobene Blöcke" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Alle verschobene Blöcke" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Verschobenen Block für aktuellen &Unterschied" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Info über WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Alle Rechte vorbehalten." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besuchen Sie die WinMerge Homepage!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Mitwirkende" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Dateien oder Ordner auswählen..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Links:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Suchen..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Rechts:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "S&uchen..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Auswählen..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "&Entpacker:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Auswählen..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Unterordner einbeziehen" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Abbrechen" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Hilfe" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Zu vergleichende Dateien oder Ordner" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Datenbank:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Nutzer:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Passwort:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Verbindung zum Ziel-VSS-Projekt" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Auf alle Objekte anwenden" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Auschecken" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Speichern unter..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Versionskontrolle" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Versionskontrollsystem" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pfad zu cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Allgemein" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Anzeige automatisch auf den ersten Unterschied &positionieren" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "Startbildschirm &deaktivieren" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fenster mit &ESC schliessen" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "P&fade im Öffnen-Dialog automatisch überprüfen" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "&Nur eine Programm-Instanz zulassen" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Öffnen-Dialog Auto&vervollständigung:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Aktivieren mehrfacher Vergleichsfenster für" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "&Ordnervergleich" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "D&ateivergleich" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Zurücksetzen" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Sprache" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Verfügbare Sprachen:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Suchen" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Suchen nach:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "&Nur ganze Wörter" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "&Groß-/Kleinschreibung beachten" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "&Reguläre Ausdrücke" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "Nicht am Dateiende um&brechen" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Richtung" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Hoch" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "&Runter" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Weitersuchen" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Ersetzen" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Erse&tzen durch:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "Nicht am Dateiende um&brechen" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Ersetze in" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Auswahl" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "&ganzer Datei" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "E&rsetzen" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "A&lle ersetzen" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "Auschecken" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Kommentare" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "Einchecken nach Auschecken" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Zeilenfilter" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Zeilenfilter aktivieren" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguläre Ausdrücke (einer pro Zeile):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Speichern" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "Neu" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Bearbeiten" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "Entfernen" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Farben" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Unterschied:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Selektierter Unterschied:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Hintergrund" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Gelöscht" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Ignorierter Unterschied:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Verschoben:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Verschoben (Selektiert):" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Wortunterschied:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Wortunterschied (Selektiert):" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Vorgaben" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "System" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Gelöschte Dateien in den &Papierkorb verschieben" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignoriere &Zeitunterschiede kleiner als 3 Sekunden" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integration" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "Zum Explorer-Kontextmenü &hinzufügen" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Er&weitertes Menü verwenden" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "Standardmäßig &Unterordner einbeziehen" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Externer Editor:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "&Filterordner:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Suchen..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Patch Generator" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Datei &1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Datei &2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "S&uchen..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "Ver&tauschen" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "A&n vorhandene Datei anfügen" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Ergebnis:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Context:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "&Leerzeichen" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "&Vergleichen" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Änderung &ignorieren" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "&Alle ignorieren" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Leer&zeilen ignorieren" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "&Groß-/Kleinschreibung beachten" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "&Befehlszeile einfügen" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Im e&xternen Editor öffnen" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Spalten anpassen" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Entpacker auswählen" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Datei-Entpacker:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Zeigt alle Entpacker, nicht die Erweiterung überprüfen." -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Erweiterungsliste:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Beschreibung:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr " Ordnervergleichsfortschritt" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Vergleiche Objekte..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Objekte verglichen:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Objekte gesamt:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Gehe nach" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "&Nach:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Datei" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Ziel" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "&Zeile" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Unterschied" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Gehe" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Vergleichen" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Leerzeichen" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "&Vergleichen" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "Änderung &ignorieren" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "&Alle ignorieren" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "&Leerzeilen ignorieren" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "&Groß-/Kleinschreibung ignorieren" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "&Zeilenumbruchunterschiede (DOS/UNIX/MAC) ignorieren" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Verschobene &Blöcke erkennen" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Vergleichs&methode:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "Nach dem ersten Unterschied &stoppen" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Kommentare filtern" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "&Syntax-Hervorhebung" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "&Automatisches Aktualisieren" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "&Mischen der Zeilenumbruch-Formate erlauben" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulatoren" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Tabulator-Größe:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "Tabulatoren &einfügen" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "&Leerzeichen einfügen" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Zeilenunterschied-Färbung" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Zeilenunterschied anzeigen" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "&Zeichen-Ebene" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "&Wort-Ebene:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Dateifilter" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Testen" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Installieren..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Neu..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Bearbeiten..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Löschen..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Geänderte Dateien speichern?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Linke Datei" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "Änderungen &speichern" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "Änderungen &verwerfen" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Rechte Datei" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "Änderungen s&peichern" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Änderungen ver&werfen" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Alle verwerfen" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Zeichensatz" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Standard-Zeichensatz" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2009,596 +2016,596 @@ msgstr "" "Ermitteln des Zeichensatzes für folgende Dateien: .html, .rc, .xml \n" "Benötigt einen Neustart des Programmes." -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "System-Zeichensatz" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Entsprechend der WinMerge Benutzeroberfläche" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Benutzerdefinierter Zeichensatz:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" "(You can always recall this message from help menu.)" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Einstellungen" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Kategorien" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Importieren..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Exportieren..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Schlüsselwörter:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Funktionsnamen:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Kommentare:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Nummern:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operatoren:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Zeichenketten:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Preprozessor:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Benutzer 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Benutzer 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Fett" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Ordnervergleichs-Bericht" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "&Berichtsdatei:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "In die &Zwischenablage kopieren" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Gemeinsamer oder privater Filter" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Welche Art von Filter möchten Sie erzeugen?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Gemeinsamer Filter (für alle Benutzer auf diesem Computer)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Privater Filter (nur für den aktuellen Benutzer)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Archiv-Unterstützung" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Die Archiv-Unterstützung erfordert das installierte 7-Zip Plugin:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "7-Zip Plugin herunterladen" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Archiv-Unterstützung aktivieren" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Eigenständiges 7-Zip verwenden, wenn vorhanden" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "&Lokales 7-Zip vom WinMerge-Ordner verwenden" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Archivtyp aus der Dateisignatur ermitteln" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Vergleichsstatistik" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Ordner:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Dateien:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Unterschiedlich" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binär:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Eindeutig" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Links:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Rechts:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identisch" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Gesamt:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Schließen" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Betrifft" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Zeichensatz auswählen für" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&Datei laden:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "Datei &speichern:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&Gleichen Zeichensatz für Beide verwenden" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "An&wenden" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Abbrechen" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Filter testen" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Teste Filter ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Text zum Testen:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Ordnername" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Ergebnis:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "&Testen" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Schließen" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&Benutzerdefinierte Textfarben verwenden" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Benutzerdefinierte Textfarben" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Leerzeichen:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Normaler Text:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Auswahl:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Pfade" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Schreib&geschützt" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Schreibg&eschützt" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Öffnen..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Speichern..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Sicherungsdateien" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Sicherungsdateien erzeugen beim:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Sicherungsdateien erzeugen im:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "Ordner der &ursprünglichen Datei" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "&Globalen Sicherungsordner:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Sicherungsdateiname:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr ".bak-&Erweiterung anhängen" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "&Zeitstempel anhängen" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "Kopieren bestätigen" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Wollen Sie wirklich XXX Objekte kopieren?" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "Von links" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "Nach rechts" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "Nein" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "040704e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated originally by Winfried Peter, continued by Joerg Schneider and Tim Gerundt" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x407, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Bereit" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "ER" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "FEST" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "RF" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "ÜB" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "MA" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2607,7 +2614,7 @@ msgstr "" "Erzeugt leere Dokumente.\n" "Neue Dokumente (Strg+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2616,7 +2623,7 @@ msgstr "" "Öffnet ein bestehendes Dokument.\n" "Öffnen (Strg+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2625,7 +2632,7 @@ msgstr "" "Schließt das aktive Dokument.\n" "Schliessen" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2634,7 +2641,7 @@ msgstr "" "Speichert das aktive Dokument.\n" "Speichern (Strg+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2643,7 +2650,7 @@ msgstr "" "Speichert das aktive Dokument unter neuem Namen.\n" "Speichern unter" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2652,7 +2659,7 @@ msgstr "" "Ändert die Seiteneinstellungen.\n" "Seite einrichten" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2661,7 +2668,7 @@ msgstr "" "Ändert die Druckerkonfiguration.\n" "Drucker einrichten" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2670,7 +2677,7 @@ msgstr "" "Druckt das aktive Dokument.\n" "Drucken" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2679,12 +2686,12 @@ msgstr "" "Zeigt die Druckvorschau an.\n" "Druckvorschau" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Zeigt alle versteckten Objekte wieder an." -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2693,32 +2700,32 @@ msgstr "" "Öffnet eine Projektdatei.\n" "Projektdatei (Strg+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu öffnen." -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu speichern." -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Projektdatei" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Projektdatei erfolgreich geladen." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Projektdatei erfolgreich gespeichert." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2727,7 +2734,7 @@ msgstr "" "Speichert die aktuellen Pfade und Einstellungen in eine Projektdatei.\n" "Projektdatei speichern" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2736,7 +2743,7 @@ msgstr "" "Zeigt Programm-Informationen, Versionsnummer und Copyright an.\n" "Info" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2745,9 +2752,6 @@ msgstr "" "Verläßt die Anwendung; fragt, ob Dokumente gespeichert werden sollen.\n" "Beenden" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2761,11 +2765,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Öffnet dieses Dokument." -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2774,7 +2781,7 @@ msgstr "" "Wechselt zum nächsten Fensterausschnitt.\n" "Nächster Ausschnitt" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2783,7 +2790,7 @@ msgstr "" "Springt zum vorherigen Fensterausschnitt zurück.\n" "Vorheriger Ausschnitt" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2792,7 +2799,7 @@ msgstr "" "Öffnet ein weiteres Fenster für das aktive Dokument.\n" "Neues Fenster" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2801,7 +2808,7 @@ msgstr "" "Ordnet die Symbole im unteren Bereich des Fensters an.\n" "Symbole anordnen" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2810,7 +2817,7 @@ msgstr "" "Ordnet die Fenster überlappend an.\n" "Überlappende Fenster" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2819,7 +2826,7 @@ msgstr "" "Ordnet die Fenster untereinander an.\n" "Fenster untereinander" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2828,7 +2835,7 @@ msgstr "" "Ordnet die Fenster nebeneinander an.\n" "Fenster nebeneinander" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2837,7 +2844,7 @@ msgstr "" "Teilt das aktive Fenster in Ausschnitte.\n" "Teilen" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2846,7 +2853,7 @@ msgstr "" "Löscht die Markierung.\n" "Löschen" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2855,7 +2862,7 @@ msgstr "" "Löscht alles.\n" "Alles löschen" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2864,7 +2871,7 @@ msgstr "" "Kopiert die Markierung und überträgt sie in die Zwischenablage.\n" "Kopieren" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2873,7 +2880,7 @@ msgstr "" "Entfernt die Markierung und überträgt sie in die Zwischenablage.\n" "Ausschneiden" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2882,7 +2889,7 @@ msgstr "" "Sucht den angegebenen Text.\n" "Suchen" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2891,7 +2898,7 @@ msgstr "" "Fügt den Inhalt der Zwischenablage ein.\n" "Einfügen" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2900,7 +2907,7 @@ msgstr "" "Wiederholt die letzte Aktion.\n" "Wiederholen" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2909,7 +2916,7 @@ msgstr "" "Ersetzt einen bestimmten Text durch einen anderen.\n" "Ersetzen" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2918,7 +2925,7 @@ msgstr "" "Markiert das gesamte Dokument.\n" "Alles markieren" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2927,7 +2934,7 @@ msgstr "" "Macht die letzte Aktion rückgängig.\n" "Rückgängig (Strg+Z)" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2936,7 +2943,7 @@ msgstr "" "Wiederholt die vorher rückgängig gemachte Aktion.\n" "Wiederherstellen (Strg+Y)" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2945,7 +2952,7 @@ msgstr "" "Blendet die Symbolleiste ein oder aus.\n" "Symbolleiste ein-/ausschalten" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2954,7 +2961,7 @@ msgstr "" "Blendet die Statusleiste ein oder aus.\n" "Statusleiste ein-/ausschalten" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2963,62 +2970,62 @@ msgstr "" "Blendet die Tab-Leiste ein oder aus.\n" "Tab-Leiste ein-/ausschalten" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Ändert die Fenstergröße." -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Ändert die Position des Fensters." -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Verkleinert das Fenster zu einem Symbol." -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Vergrößert das Fenster zu voller Größe." -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Wechselt zum nächsten Dokumentfenster." -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Wechselt zum vorherigen Dokumentfenster." -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Schließt das aktive Fenster und fordert zur Dokumentspeicherung auf." -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Stellt das Fenster in seiner normalen Größe wieder her." -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Aktiviert die Task-Liste." -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Aktiviert dieses Fenster." -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3027,7 +3034,7 @@ msgstr "" "Beendet die Seitenansicht.\n" "Seitenansicht beenden" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3046,23 +3053,23 @@ msgstr "" "WinMerge.Document\n" "WinMerge Dokument" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Mischen der Zeilenumbruch-Formate erlauben" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Beliebige Taste" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Rechtsklick auf den Pfad zum Kopieren." -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3071,152 +3078,152 @@ msgstr "" "Entwickler:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 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 Public Lizenz unter dem Hilfe-Menü an." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Abbruch" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Wiederholen" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignorieren" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "&Alle ignorieren" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Ja zu &allen" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Nein" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Nein zu a&llen" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Fortsetzen" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "Über&springen" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "&Alle überspringen" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Diese &Meldung nicht erneut anzeigen." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Diese &Frage nicht erneut stellen." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Syntaxfarben" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Textfarben" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Versionskontrolle" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "Nach:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "Von links:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "Nach links:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "Von rechts:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "Nach rechts:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Version %1 - Deutsch" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Eigenschaften (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle Meldungen werden wieder angezeigt." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Datei(en) dieses Vergleichs wurden geändert. Einige Einstellungen werden erste wirksam, wenn der aktuelle Dateivergleich neu gestartet wurde." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Die Änderung der Schriftart wird auf keines der offenen Diff-Fenster angewendet werden." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3227,7 +3234,7 @@ msgstr "" "\n" "Bitte benutzen Sie Werte von 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3235,107 +3242,107 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Öffnen" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programme|*.exe;*.bat;*.cmd|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle Dateien (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektdatei (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Einstellungsdateien (*.ini)|*.ini|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-Dateien (*.htm,*.html)|*.htm;*.html|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Voller Inhalt" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Schneller Inhalt" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Änderungsdatum" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Änderungsdatum und Größe" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Größe" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Name" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Pfad" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Beschreibung" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Dateinamen für neuen Filter auswählen" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3344,7 +3351,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3357,7 +3364,7 @@ msgstr "" "\n" "Bitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3368,7 +3375,7 @@ msgstr "" "\n" "Bitte wählen Sie den Filterordner unter Einstellungen/System aus." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3381,12 +3388,12 @@ msgstr "" "\n" "Ist die Datei möglicherweise schreibgeschützt?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Zu installierenden Filter auswählen" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3397,208 +3404,208 @@ msgstr "" "\n" "Die Filterdatei konnte nicht in den Filterordner kopiert werden." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterdatei existiert bereits. Existierenden Filter überschreiben?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Regulärer Ausdruck" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Pfad zu Cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Pfad zu SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Ordnervergleichs-Ergebnisse" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Dateivergleich" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Unbenannt links" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Unbenannt rechts" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Überprüfe Dateien..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Öffne Auswahl" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Kopiere links nach rechts" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Kopiere rechts nach links" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Kopiere alles nach links" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Kopiere alles nach rechts" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Kopiere Dateien..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Lösche Dateien..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Verschiebe Dateien..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Erzeugt den Bericht..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ze: %s Sp: %d/%d Zchn: %d/%d Format: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Zeile: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ze: %s Sp: %d/%d Zchn: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Merge" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Unterschied %1 von %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 Unterschiede gefunden" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 Unterschied gefunden" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 von %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Objekte: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wählen Sie zwei Dateien oder Ordner zum Vergleichen aus" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Ordnerauswahl" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Zwei Ordner oder zwei Dateien zum Vergleichen auswählen." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Der linke Pfad ist ungültig!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Der rechte Pfad ist ungültig!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Beide Pfade sind ungültig!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Zwei Dateien zum Aktivieren der Entpacker-Auswahl auswählen." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Datei und Ordner können nicht verglichen werden!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Datei nicht gefunden: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Datei nicht entpackt: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3611,7 +3618,7 @@ msgstr "" "\n" "sind identische Binärdateien." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3624,7 +3631,7 @@ msgstr "" "\n" "sind unterschiedliche Binärdateien." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3635,7 +3642,7 @@ msgstr "" "\n" "ist eine Binärdatei. Binärdateien und Textdateien können nicht verglichen werden." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3648,37 +3655,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Speichern unter" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Änderungen in %1 speichern?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Fehler beim Prüfen des Zielverzeichnisses auf Schreibschutz" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Fehler beim Erstellen einer Sicherheitskopie" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3691,7 +3698,7 @@ msgstr "" "\n" "Trotzdem fortfahren?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3708,7 +3715,7 @@ msgstr "" "\t-einen anderen Dateinamen verwenden? (Ok drücken)\n" "\t-die aktuelle Operation abbrechen? (Abbruch drücken)" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3723,7 +3730,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3738,7 +3745,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3753,7 +3760,7 @@ msgstr "" "\n" "Geänderte Datei überschreiben?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3762,7 +3769,7 @@ msgstr "" "%1\n" "ist als schreibgeschützt markiert. Möchten Sie das schreibgeschützte Objekt überschreiben?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3777,17 +3784,17 @@ msgstr "" "\n" "Wenn Sie die Dateien aktualisieren wollen, müssen Sie den aktuellen Dateivergleich schliessen und neu aufrufen." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Speichere linke Datei unter" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Speichere rechte Datei unter" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3798,42 +3805,42 @@ msgstr "" "\n" "Aktualisieren Sie die Dokumente, bevor Sie fortfahren." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Dateien auschecken vom VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Fehler beim Ausführen eines Befehles des Versionierungssystems." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Keine VSS Datenbank(en) gefunden!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Fehler vom VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3844,7 +3851,7 @@ msgstr "" " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht.\n" " Auschecken rückgängig machen?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3853,179 +3860,179 @@ 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Keines" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (kleiner als 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 und höher)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "An Leerzeichen abbrechen" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "An Leerzeichen oder Interpunktion abbrechen" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiert ausgewähltes Objekt ins angegebene Verzeichnis." -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiert ausgewähltes Objekt in ein beliebiges Verzeichnis." -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Löscht ausgewähltes Objekt auf der linken Seite." -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Löscht ausgewähltes Objekt auf der rechten Seite." -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Löscht ausgewählte Objekte auf beiden Seiten." -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Versteckt ausgewählte Objekte (dynamischer Filter)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Nennt ausgewähltes Objekt auf beiden Seiten um." -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Rechts nach Links (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Links nach Rechts (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Rechts nach Links (%1 von %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Links nach Rechts (%1 von %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Links nach... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Rechts nach... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Links nach... (%1 von %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Rechts nach... (%1 von %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 von %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 von %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Beide (%1 von %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Zielordner auswählen." -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Linke Seite - Zielordner auswählen:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Rechte Seite - Zielordner auswählen:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Dateien betroffen)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 von %2 Dateien betroffen)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Wollen Sie wirklich alle Unterschiede in die linke Datei kopieren?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Wollen Sie wirklich alle Unterschiede in die rechte Datei kopieren?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4041,17 +4048,17 @@ msgstr "" "%2\n" "kopieren?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Wollen Sie wirklich %1 von %2 ausgewählte Objekte kopieren?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Wollen Sie wirklich %1 von %2 ausgewählte Objekte löschen?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4063,7 +4070,7 @@ msgstr "" "%1\n" "löschen?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4075,17 +4082,17 @@ msgstr "" "%1\n" "löschen?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Wollen Sie wirklich kopieren:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Wollen Sie wirklich %d Objekte kopieren:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4097,458 +4104,458 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Öffne linke Datei" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Öffnet die linke Datei im externen Editor." -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Öffne linke Datei mit..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Öffne rechte Datei" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Öffnet die rechte Datei im externen Editor." -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Öffne rechte Datei mit..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Konnte externen Editor nicht ausführen: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Unbekannte Erweiterung beim externen Editor: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiere Dateinamen in die Zwischenablage" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiere linken Pfad in die Zwischenablage" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiere rechten Pfad in die Zwischenablage" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiere beide Pfade in die Zwischenablage" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Unbekanntes Archiv Format" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Fügt Objekte von der linken Seite zum Archiv hinzu." -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Fügt Objekte von der rechten Seite zum Archiv hinzu." -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Fügt Objekte von beiden Seiten zum Archiv hinzu." -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Fügt unterschiedliche Objekte zum Archiv hinzu (beide Seiten)." -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Verschiebt die ausgewählte Datei in ein beliebiges Verzeichnis." -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Verschiebt die ausgewählte Datei in ein beliebiges Verzeichnis." -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Dateiname" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Ordner" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Vergleichsergebnis" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Linkes Datum" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Rechtes Datum" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Erweiterung" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Linke Größe" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Rechte Größe" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Rechte Größe (Kurz)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Linke Größe (Kurz)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Linkes Erstellungsdatum" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Rechtes Erstellungsdatum" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Neuere Datei" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Linke Dateiversion" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Rechte Dateiversion" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Kurz-Ergebnis" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Linke Attribute" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Rechte Attribute" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Linkes Zeilenende" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Rechtes Zeilenende" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Linke Kodierung" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Rechte Kodierung" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Ignorierte Unter." -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Unterschiede" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binär" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Dateien können nicht verglichen werden" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Objekt abgebrochen" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Datei übersprungen" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Ordner übersprungen" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Nur Links: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Nur Rechts: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Binärdateien sind identisch" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Binärdateien sind unterschiedlich" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Dateien sind unterschiedlich" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Nur Links" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Nur Rechts" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "Fehler" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ausführungszeit: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 Objekt ausgewählt" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 Objekte ausgewählt" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Dateiname oder Ordnername." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Unterordnername, wenn Unterordner vorhanden sind." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Vergleichsergebnis, langes Format." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Linkes Änderungsdatum." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Rechtes Änderungsdatum." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Dateierweiterung." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Linke Dateigröße in Byte." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Rechte Dateigröße in Byte." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Linke Dateigröße gekürzt." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Rechte Dateigröße gekürzt." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Linkes Erstellungsdatum." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Rechtes Erstellungsdatum." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Zeigt, welche Seite ein neueres Änderungsdatum hat." -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Linke Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Rechte Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Vergleichsergebnis, kurzes Format." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Linke Attribute." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Rechte Attribute." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Linker Zeilenenden-Typ" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Rechter Zeilenenden-Typ" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Linke Zeichensatz-Kodierung." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Rechte Zeichensatz-Kodierung." -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zeigt ein Asterisk (*), wenn die Datei binär ist." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Vergleiche %1 mit %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Komma-getrennte Liste" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Tab-getrennte Liste" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "Einfaches HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "Einfaches XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Der Bericht existiert bereits. Überschreiben?" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4557,47 +4564,47 @@ msgstr "" "Fehler beim Erzeugen des Berichtes:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Der Bericht wurde erfolgreich geschrieben." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Die gleiche Datei ist in beiden Feldern ausgewählt." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Die ausgewählten Dateien sind identisch." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Der ausgewählte Ordner besteht nur in einer Seite und kann deshalb nicht geöffnet werden." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Beim Vergleichen der Dateien ist ein Fehler aufgetreten." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Binärdateien können nicht visuell verglichen werden." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Verzeichnisse können nicht visuell verglichen werden." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4612,7 +4619,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4623,22 +4630,22 @@ msgstr "" "Mit den aktuellen Einstellungen werden sie zum Hauptformat vereinheitlicht.\n" "Möchten Sie die Einstellungen ändern und das Mischen der Zeilenumbruch-Formate erlauben?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Ein Fehler trat beim Prediffing der Datei '%1' mit dem Plugin '%2' auf. Das Prediffing wird daher nicht mehr angewendet." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Der ausgewählte Ordner ist ungültig." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kann keine Binärdatei im Editor öffnen." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4649,132 +4656,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Warnung: Die Dateien haben unterschiedliche Kodierungen, links=%s und rechts=%s, und das Vermischen führt möglicherweise zu Informationsverlusten." -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informationsverlust wegen Kodierungsfehlern: Beide Dateien" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informationsverlust wegen Kodierungsfehlern: Rechte Datei" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informationsverlust wegen Kodierungsfehlern: Linke Datei" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Kein Unterschied" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Zeilen-Unterschied" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 Vorkommen ersetzt." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kann \"%s\" nicht finden" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Kopiere vollständigen Pfad" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Kopiere Dateiname" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Positionsleiste" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Unterschiedsleiste" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Die Patchdatei wurde erfolgreich geschrieben." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Die Patchdatei existiert bereits. Überschreiben?" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 Dateien ausgewählt]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Unified" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Konnte nicht in die Datei %1 schreiben." -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Der angegebene Ausgabepfad ist kein absoluter Pfad: %1" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Geben Sie eine Ausgabedatei an." -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kann keine Patchdatei von Binärdateien erzeugen." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kann keine Patchdatei von Verzeichnissen erzeugen." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4785,17 +4792,17 @@ msgstr "" "\n" "Das Erzeugen eines Patches erfordert, dass es keine ungespeicherten Änderungen in den Dateien gibt." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Der Ordner existiert nicht." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Die aktuellen Resultate des Ordnervergleichs werden gelöscht." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4806,7 +4813,7 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4815,7 +4822,7 @@ msgstr "" "\n" "Hinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen deaktiviert." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4824,37 +4831,37 @@ msgstr "" "\n" "Hinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen auf eigenständige Arbeitsweise beschränkt." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Datei zum Exportieren auswählen" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Datei zum Importieren auswählen" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Einstellungen aus der Datei importiert." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Einstellungen in die Datei exportiert." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Konnte die Einstellungen nicht aus der Datei importieren." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Konnte die Einstellungen nicht in die Datei exportieren." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4862,1098 +4869,1098 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Regulärer Ausdruck Fehler" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Keine Übereinstimmung" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Ungültiger regulärer Ausdruck" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Ungültiges Vergleichszeichen" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Ungültiger Zeichenklasse-Name" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Nachfolgender Backslash" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Ungültiger Rückbezug" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Unpassende [ oder [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Unpassende ( oder \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Unpassende \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Ungültiger Inhalt von \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Ungültiges Bereichsende" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Platz im Hauptspeicher reicht nicht aus" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Ungültiger vorhergehender regulärer Ausdruck" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Vorzeitiges Ende des regulären Ausdruckes" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Regulärer Ausdruck zu groß" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Unpassende ) oder \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Afrikanisch" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanisch" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabisch (Saudi-Arabien)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabisch (Irak)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabisch (Ägypten)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabisch (Libyen)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabisch (Algerien)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabisch (Marokko)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabisch (Tunesien)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabisch (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabisch (Jemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabisch (Syrien)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabisch (Jordanien)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabisch (Libanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabisch (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabisch (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabisch (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabisch (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armenisch" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Aserbaidschanisch (Lateinisch)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Aserbaidschanisch (Kyrillisch)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Baskenland" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Belarussisch" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgarisch" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Katalanisch" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chinesisch (Traditionell)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chinesisch (Vereinfacht)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chinesisch (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chinesisch (Singapur)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chinesisch (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Kroatisch" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Tschechisch" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Dänisch" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Niederländisch" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Niederländisch (Belgien)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Englisch (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Englisch (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Englisch (Australien)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Englisch (Kanada)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Englisch (Neuseeland)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Englisch (Irland)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Englisch (Südafrika)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Englisch (Jamaika)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Englisch (Karibik)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Englisch (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Englisch (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Englisch (Simbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Englisch (Philippinen)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Estnisch" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Färöisch" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Finnisch" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Französisch" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Französisch (Belgien)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Französisch (Kanada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Französisch (Schweiz)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Französisch (Luxemburg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Französisch (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgisch" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Deutsch (Deutschland)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Deutsch (Schweiz)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Deutsch (Österreich)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Deutsch (Luxemburg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Deutsch (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Griechisch" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebräisch" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Ungarisch" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Isländisch" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesisch" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italienisch" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italienisch (Schweiz)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japanisch" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kaschmiri (Indien)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Kasachisch" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Koreanisch" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Koreanisch (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Lettisch" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Litauisch" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malaiisch (Malaysia)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malaiisch (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norwegisch (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norwegisch (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polnisch" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugiesisch" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugiesisch (Brasilien)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Rumänisch" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russisch" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbisch (Lateinisch)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbisch (Kyrillisch)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Slowakisch" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Slowenisch" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Spanisch" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Spanisch (Mexikanisch)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Spanisch (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Spanisch (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Spanisch (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Spanisch (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Spanisch (Dominikanisch)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Spanisch (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Spanisch (Kolumbien)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Spanisch (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Spanisch (Argentinien)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Spanisch (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Spanisch (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Spanisch (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Spanisch (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Spanisch (Bolivien)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Spanisch (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Spanisch (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Spanisch (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Spanisch (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Kenia)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Schwedisch" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Schwedisch (Finnland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tamilisch" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatarisch (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Thailändisch" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Türkisch" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ukrainisch" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (Indien)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Usbekisch (Lateinisch)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Usbekisch (Kyrillisch)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamesisch" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Westeuropäisch" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Osteuropäisch" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Ostasiatisch" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "SO & SW-Asiatisch" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Mitteleuropäisch" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Nicht anwendbar" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Gemischt" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Speichert die linke Datei." -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Speichert die rechte Datei." -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Speichert die linke Datei unter..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Speichert die rechte Datei unter..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Ändert den linken Schreibschutz-Status." -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Ändert den rechten Schreibschutz-Status." -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Konvertiert Zeilenumbrüche ins DOS Format." -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Konvertiert Zeilenumbrüche ins UNIX Format." -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Konvertiert Zeilenumbrüche ins MAC Format." -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Wechselt zwischen Bearbeitungs- und Merging-Modus." -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5962,12 +5969,12 @@ msgstr "" "Zeigt und passt die Dateikodierungs-Eigenschaften an.\n" "Dateikodierungs-Eigenschaften" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5976,7 +5983,7 @@ msgstr "" "Markiert den unterschiedlichen Bereich in der aktuellen Zeile.\n" "Unterschied in der aktuellen Zeile" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5985,7 +5992,7 @@ msgstr "" "Geht zur Zeile oder zum Unterschied.\n" "Gehe nach (Strg+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5994,7 +6001,7 @@ msgstr "" "Nimmt Programm-Einstellungen vor.\n" "Einstellungen" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6003,37 +6010,37 @@ msgstr "" "Aktualisiert die Anzeige\n" "Aktualisieren (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiert die ausgewählten Zeilen in die Zwischenablage und fügt Zeilennummern vor den Zeilenanfang." -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Aktualisiert die ausgewählten Objekte." -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Lesezeichen setzen oder löschen." -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Zum nächsten Lesezeichen gehen." -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Zum vorherigen Lesezeichen gehen." -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Alle Lesezeichen löschen." -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6042,7 +6049,7 @@ msgstr "" "Objekte anzeigen die exakt gleich sind.\n" "Identische Objekte" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6051,7 +6058,7 @@ msgstr "" "Objekte anzeigen die Unterschiede haben.\n" "Unterschiedliche Objekte anzeigen" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6060,7 +6067,7 @@ msgstr "" "Zeigt eindeutige Objekte auf der linken Seite an.\n" "Eindeutige Objekte links anzeigen" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6069,7 +6076,7 @@ msgstr "" "Zeigt eindeutige Objekte auf der rechten Seite an.\n" "Eindeutige Objekte rechts anzeigen" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6078,7 +6085,7 @@ msgstr "" "Zeigt Binärdateien an.\n" "Binärdateien anzeigen" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6087,7 +6094,7 @@ msgstr "" "Zeigt übersprungene Objekte an.\n" "Übersprungene Objekte anzeigen" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6096,7 +6103,7 @@ msgstr "" "Wählt die Schrift für die Anzeige.\n" "Schrift auswählen" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6105,27 +6112,27 @@ msgstr "" "Stellt die Schrift für die Anzeige zurück auf die Standard-Systemschrift.\n" "Standard-Schrift verwenden" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Zeigt Leerzeichen an." -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Blendet die Unterschiedsleiste ein oder aus." -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Die Positionsleiste zeigt gesamte Abbildungen von den Dateien." -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Zeigt die Vergleichsstatistik an." -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6134,7 +6141,7 @@ msgstr "" "Wählt die Sprache der Benutzeroberfläche.\n" "Sprache" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6143,12 +6150,12 @@ msgstr "" "Zeigt Unterschiede innerhalb der Zeilen mit unterschiedlicher Farbe an.\n" "Zeilenunterschied anzeigen" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Vertauscht die Position der beiden Ausschnitte." -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6157,7 +6164,7 @@ msgstr "" "Zeigt Zeilennummern an.\n" "Zeilennummern anzeigen" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6166,7 +6173,7 @@ msgstr "" "Aktiviert das Umbrechen der Zeilen.\n" "Zeilen umbrechen" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6175,17 +6182,17 @@ msgstr "" "Zeigt Markierungsränder für beide Ausschnitte an.\n" "Markierungsränder anzeigen" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6194,7 +6201,7 @@ msgstr "" "Bewegt die Anzeige zum vorigen Unterschied.\n" "Vorheriger Unterschied (Alt+Hoch)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6203,7 +6210,7 @@ msgstr "" "Bewegt die Anzeige zum nächsten Unterschied.\n" "Nächster Unterschied (Alt+Runter)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6212,7 +6219,7 @@ msgstr "" "Bewegt die Anzeige zum ersten Unterschied.\n" "Erster Unterschied (Alt+Pos1)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6221,7 +6228,7 @@ msgstr "" "Bewegt die Anzeige zum aktuellen Unterschied.\n" "Aktueller Unterschied (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6230,7 +6237,7 @@ msgstr "" "Bewegt die Anzeige zum letzten Unterschied.\n" "Letzter Unterschied (Alt+Ende)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6239,7 +6246,7 @@ msgstr "" "Kopiert den ausgewählten Text in die rechte Datei.\n" "Nach rechts kopieren (Alt+Rechts)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6248,7 +6255,7 @@ msgstr "" "Kopiert den ausgewählten Text in die linke Datei.\n" "Nach links kopieren (Alt+Links)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6257,7 +6264,7 @@ msgstr "" "Kopiere Unterschied nach Rechts und springe zum nächsten Unterschied.\n" "Nach rechts kopieren und fortschreiten (Strg+Alt+Rechts)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6266,7 +6273,7 @@ msgstr "" "Kopiere Unterschied nach Links und springe zum nächsten Unterschied.\n" "Nach links kopieren und fortschreiten (Strg+Alt+Links)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6275,7 +6282,7 @@ msgstr "" "Kopiert alle Unterschiede in die rechte Datei.\n" "Alles nach rechts kopieren" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6284,72 +6291,72 @@ msgstr "" "Kopiert alle Unterschiede in die linke Datei.\n" "Alles nach links kopieren" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Löscht ausgewählte Objekte von beiden Seiten." -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Vergleicht ausgewählte Objekte. (Vergleicht das erste Objekt, wenn mehrere Objekte ausgewählt wurden.)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Auswählen und wieder ordnen der Spalten vom Ordnervergleich." -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Erzeugt eine Patchdatei." -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Auswählen und modifizieren von Filtern." -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Erzeugt einen Bericht von den Vergleichsergebnissen." -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Der Benutzer wählt den Entpacker (kein Entpacken beim Ordnervergleich)." -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Auswählen eines Entpackers zum Bearbeiten dieser Datei." -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Kein Prediffer (Normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Vorgeschlagene Plugins" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Andere Plugins" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Entlädt alle Plugins und lädt sie neu (für Entwickler)." -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6358,12 +6365,12 @@ msgstr "" "Aktiviert die nächste sichtbare Datei\n" "Aktiviere nächste Datei" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Schließt alle geöffneten Fenster." -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6372,22 +6379,22 @@ msgstr "" "Öffnet die WinMerge Benutzeranleitung.\n" "Hilfe" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Ausgeben der aktuellen WinMerge Versionsinformationen und Konfiguration in eine Textdatei." -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Zeigt die GNU Public Lizenz an." -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6396,7 +6403,7 @@ msgstr "" "Öffnet den Index der WinMerge Hilfe.\n" "Hilfe-Index" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6405,267 +6412,272 @@ msgstr "" "Öffnet die Suche der WinMerge Hilfe.\n" "Hilfe-Suche" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Plugin Einstellungen" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Kein Prediffer." -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Prediff ist möglich." -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nicht gefunden - .sct Skripte deaktiviert." -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Öffnet die Datei mit registrierter Anwendung." -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Öffnet die Datei mit externem Editor." -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Öffnet die Datei mit einem bestimmten Programm." -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Keine verschobene Blöcke anzeigen." -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Alle verschobene Blöcke anzeigen." -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Verschobenen Block nur für den aktuellen Unterschied anzeigen." -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Geht zum Unterschied unter dem Cursor." -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G&ehe nach Unterschied %1 von %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "G&ehe nach Zeile %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Deaktiviert" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Von Dateisystem" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Von MRU-Liste" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Versteckt die Symbolleiste." -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Zeigt kleine Symbolleiste an." -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Zeigt große Symbolleiste an." diff --git a/Src/Languages/Hungarian.po b/Src/Languages/Hungarian.po index 5e6870725..49324192d 100644 --- a/Src/Languages/Hungarian.po +++ b/Src/Languages/Hungarian.po @@ -71,7 +71,7 @@ msgstr "&Kiv #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Másolás" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "&Beillesztés" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&Ugrás..." @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "Meg&nyitás" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "&Társított programmal" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "&Külsõ szerkesztõvel" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&Egyéb programmal..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Fájl" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Új\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "M&egnyitás...\tCtrl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Projekt megnyitása...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -158,1845 +158,1852 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Kilépés" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "S&zerkesztés" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Beállítások..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Nézet" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Betûtípus..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Alapértelmezett betûtípus használata" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "&Álapotsor" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Nyelv..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Eszközök" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Szûrõk..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Patch generálása..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Bõvítmények" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "&Kézi kicsomagolás" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatikus kicsomagolás" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Szerkesztés a Kicsomagolóval" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Bõvítmények betöltése" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Ablak" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Bezárás" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "&Mindegyik bezárása" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "&Panel váltása\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Elrendezés &vízszintesen" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Elrendezés &függõlegesen" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Felosztás" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Súgó" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Tartalomjegyzék...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "" #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "" #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "&Konfiguráció..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Ar&chívum támogatás tiltva..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "" -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&A Winmerge névjegye..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Projekt megnyitása...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Bal oldal csak &olvasható" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Jobb oldal csak o&lvasható" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "M&indent kijelöl\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "&Rejtett elemek mutatása" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Frissítés\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Olvasztás" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "&Összehasonlítás\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Következõ eltérés\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Elõzõ eltérés\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "E&lsõ eltérés\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuális eltérés\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Utolsó eltérés\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Másolás &Jobbra\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Másolás &Balra\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Törlés\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Oszlopok testreszabása..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "&Jelentés generálása..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Mentés\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "&Bal oldal mentése" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Mentés" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Menté&s más néven..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "&Jobb oldal mentése" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "&Olvasztási mód\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Visszavonás\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Még&is\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Kivágás\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Másolás\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Beillesztés\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Keresé&s...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Csere...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Szkriptek" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Üres >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Haladó" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Másolás sorszámokkal együtt\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ugrás...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "&Szóközök mutatása" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Sorok &eltérésének mutatása" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Eltérés &panel" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "&Pozíció panel" -#: Merge.rc:428 +#: Merge.rc:430 #, 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:429 +#: Merge.rc:431 #, 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:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "M&inden Jobbra másolása" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Mi&nden Balra másolása" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Elõvizsgáló" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "&Összehasonlítás" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&Balról Jobbra" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "B&alról..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "&Jobbról Balra" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "J&obbról..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Áthelyezés" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Balról..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&Jobbról..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Törlés" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Bal oldal" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Jobb oldal" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Mindkettõ" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "Elemek &rejtése" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "&Bal oldal megnyitása" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "&Jobb oldal megnyitása" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "&Útvonalak másolása" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Bal oldal (%1 ennyibõl: %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Jobb oldal (%1 ennyibõl: %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Mindkét oldal (%1 ennyibõl: %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "&Fájlnevek másolása" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Bal oldal... (%1 ennyibõl: %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Jobb oldal... (%1 ennyibõl: %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Mindkét oldal... (%1 ennyibõl: %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Eltérések... (%1 ennyibõl: %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "&Frissítés" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "&Teljes útvonal másolása" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "&Fájlnév másolása" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Elõvizsgáló Beállítások" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Nincs elõvizsgálat" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Automatikus elõvizsgálat" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Ugrás &eltérésre" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Nem mozgatott blokkok" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Minden mozgatott blokk" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "A &jelenlegi Eltérés mozgatott blokkja" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "A WinMerge névjegye" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Minden jog fenntartva." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Látogasd meg a WinMerge honlapját!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "Vissza" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Közremûködõk" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Válaszd ki a fájlokat vagy könyvtárakat..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Bal:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Tallózás..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Jobb:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "T&allózás..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Szûrõ:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Kiválasztás..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "&Csomagoló:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "&Kiválasztás..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Alkönyvtárakkal együtt" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Állapot:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Mégsem" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Súgó" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Összehasonlítandó fájlok vagy könyvtárak" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Adatbázis:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Felhasználó:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Jelszó:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Link a cél VSS projekthez" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Alkalmazás minden elemen" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Ellenõrzés" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Mentés másként..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Verzió Rendszer" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Verzió Rendszer:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "A &cleartool.exe elérési útvonala:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Általános" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatikus &ugrás az elsõ eltérésre" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Splash Screen letiltása" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Ablakok bezárása az &ESC billentyûvel" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automatikus útvonalellenõrzés a &Megnyitás ablakban" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "Csak &egy példány futásának engedélyezése" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Többszörös összehasonlító ablakok engedélyezése:" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "&Mappa összehasonlításkor" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "&Fájl összehasonlításkor" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Visszaállít" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Nyelv" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Választható nyelvek:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Keresés" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Szöveg:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Csak &teljes szavak mutatása" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Kis-nagybetû &érzékenység" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "&Reguláris kifejezések" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Irány" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Fel" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "&Le" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "Kere&sés" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Csere" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Cs&ere erre:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "&Álljon meg a fájl végénél" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "A csere tartománya" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Kijelölés" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "Teljes &fájl" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Csere" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "&Mindet" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "Ellenõriz" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Megjegyzések" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Sorszûrõk" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguláris kifejezések (soronként egy):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Színek" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Eltérés:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Kijelölt Eltérés:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Háttér" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Törölt" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Szöveg" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Kihagyott Eltérés:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Áthelyezett:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Kijelölt áthelyezett:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Szó eltérés:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Kijelölt szó eltérés:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Alapértékek" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Kérdés" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Rendszer" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "A törölt fájlok a &Lomtárba kerüljenek" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Hozzáadás az Intézõ kontext-menüjéhez" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "&Bõvített menü engedélyezése" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Belsõ szerkesztõ:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Tallózás..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Patch Generátor" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Fájl&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Fájl&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "T&allózás..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "&Megfordítás" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "&Hozzáfûzés a létezõ fájlhoz" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Eredmény:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "&Formátum" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "St&ílus:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Környezet:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "&Szóközök" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "&Összehasonlít" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "&Változások kihagyása" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Minden kihagyása" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Üres sorok kihagyása" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "&Kis-nagybetû érzékenység" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "&Parancssor mellékelése" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Megnyitás a &Belsõ Szerkesztõvel" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Oszlopok mutatása" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Kicsomagoló kiválasztása" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Fájl kicsomagoló:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Minden kicsomagoló mutatása kiterjesztéstõl függetlenül" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Kiterjesztések listája:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Leírás:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Leállítás" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Ugrás" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "U&grás:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Fájl" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Mire ugorjon:" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "&Sorra" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Eltérésre" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Ugrás" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Összehasonlítás" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Szóközök" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "&Összehasonlítás" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "&Változtatások kihagyása" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "&Minden kihagyása" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "&Üres sorok kihagyása" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "&Kis-nagybetû különbségek kihagyása" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Sortörési eltérések kihagyása (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Mozgatott &blokk észlelés bekapcsolása" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "&Fájl összehasonlítási módszer:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "Megállás az &elsõ különbségnél" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Szerkesztõ" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "&Szintaxis kiemelés" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "&Automatikus újraolvasás" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "&Eredeti újsor-karakterek megõrzése" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulátorok" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "Tab. &mérete:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "&Tabulátorok használata" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "&Szóközök használata" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Sorok eltérésének színezése" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Sorok eltérésének mutatása" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "FájlSzûrõk" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Új..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Szerkeszt..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Töröl..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Módosított fájlok mentése?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Bal oldali fájl" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Változtatások mentése" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "Változtatások &elvetése" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Jobb oldali fájl" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "V&áltoztatások mentése" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Változtatások e&lvetése" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Elvet mindent" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Kódlap" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Alapértelmezett kódlap" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2005,32 +2012,32 @@ msgstr "" "A kódlap információ megkeresése ezekhez a fájlokhoz: .html, .rc, .xml \n" "a munkafolyamat újraindítását igényli" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Rendszer kódlap" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "A Winmerge felhasználói felületéhez igazodva" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Egyedi kódlap:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Archívum támogatás letiltva" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nem ismerhetõ fel a 7-Zip verziója (nincs telepítve?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2039,12 +2046,12 @@ msgstr "" "Az Archívum támogatás a 7-Zip 3.11-es vagy újabb verzióját igényli, melynek telepítve kell lennie a helyi gépen, vagy a\n" "szükséges komponenseknek megtalálhatóaknak kell lenniük a program könyvtárában." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Szükséges továbbá egy megfelelõ felületi bõvítmény (Merge7z*.dll) az útvonalban." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2053,12 +2060,12 @@ msgstr "" "Kérlek használd a 7-Zip lentebb megjelölt verzióját, amíg a felületi bõvítmény újabb\n" "verziója meg nem jelenik." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Verzió" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2067,54 +2074,54 @@ msgstr "" "Szükséges bõvítmény\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "A 7-Zip javasolt verziója:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "megvan" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "A számítógépen telepített 7-Zip szoftver:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "nincs" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "hiányzik" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Az önálló mûködéshez szükséges 7-Zip komponensek:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "lejárt" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Elérhetõ bõvítmények:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2123,486 +2130,486 @@ msgstr "" "Ne jelenjen meg ez az &üzenet.\n" "(A súgó menübõl késõbb visszaállíthatod ezt az üzenetet.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Bõvítmény letöltése" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Opciók" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Kategóriák" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Kulcsszavak:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Függvény nevek:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Megjegyzések:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Számok:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operátorok:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Sztringek:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Elõfeldolgozó:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Felhasználó 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Felhasználó 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Félkövér" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Könyvtár összehasonítási jelentés" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "Jelentés &fájl:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Stílus:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Megosztott vagy saját szûrõ" -#: Merge.rc:1420 +#: Merge.rc:1423 #, 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:1422 +#: Merge.rc:1425 #, 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:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Saját szûrõ (csak a jelenlegi felhasználónak)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Archívum támogatás" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Az archívum támogatáshoz a 7-Zip bõvítmény telepítése szükséges:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "7-Zip bõvítmény letöltése" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "Archív fájlok támogatásának &engedélyezése" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Használja a különálló 7-Zip programot, ha elérhetõ" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "H&asználja a helyi 7-Zip programot a WinMerge mappájában" -#: Merge.rc:1445 +#: Merge.rc:1448 #, 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:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Különbözõ" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Egyezõ" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Mégsem" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "040E04e2" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Fordította: Márton Balázs" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x040E, 1250" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Kész" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2611,7 +2618,7 @@ msgstr "" "Új dokumentumok létrehozása\n" "Új dokumentum (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2620,7 +2627,7 @@ msgstr "" "Létezõ dokumentum megnyitása\n" "Megnyitás (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2629,7 +2636,7 @@ msgstr "" "Az aktív dokumentum bezárása\n" "Bezárás" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2638,7 +2645,7 @@ msgstr "" "Az aktív dokumentum mentése\n" "Mentés (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2647,7 +2654,7 @@ msgstr "" "Az aktív dokumntum mentése új néven\n" "Mentés mésként" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2656,7 +2663,7 @@ msgstr "" "A nyomtatási beállítások megváltoztatása\n" "Oldalbeállítás" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2665,7 +2672,7 @@ msgstr "" "A nyomtató és a nyomtatási opciók megváltoztatása\n" "Nyomtatóbeállítás" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2674,7 +2681,7 @@ msgstr "" "Az aktív dokumentum nyomtatása\n" "Nyomtatás" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2683,12 +2690,12 @@ msgstr "" "Az oldalak megjelenítése\n" "Nyomtatási elõnézet" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Minden rejtett elem legyen újból látható" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2697,39 +2704,39 @@ msgstr "" "Projekt fájl megnyitása\n" "Projekt fájl (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2738,7 +2745,7 @@ msgstr "" "A programmal kapcsolatos információk megjelenítése\n" "Névjegy" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2747,9 +2754,6 @@ msgstr "" "A program bezárása; a nem mentett fájlok elmentésének lehetõségével\n" "Kilépés" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2763,11 +2767,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "A dokumentum megnyitása" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2776,7 +2783,7 @@ msgstr "" "Váltás a következõ ablak paneljára\n" "Következõ panel" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2785,7 +2792,7 @@ msgstr "" "Váltás az elõzõ ablak paneljára\n" "Elõzõ panel" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2794,7 +2801,7 @@ msgstr "" "Új ablak nyitása az aktív dokumentumhoz\n" "Új ablak" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2803,7 +2810,7 @@ msgstr "" "Ikonok elrendezése az ablak alján\n" "Ikonok elrendezése" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2812,7 +2819,7 @@ msgstr "" "Az Ablakok egymásra helyezése\n" "Ablakok egymásra elhelyezése" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2821,7 +2828,7 @@ msgstr "" "Az ablakok felosztása egymást nem fedõ módon\n" "Ablakok felosztása" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2830,7 +2837,7 @@ msgstr "" "Az ablakok felosztása egymást nem fedõ módon\n" "Ablakok felosztása" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2839,7 +2846,7 @@ msgstr "" "Az aktív ablak felbontása panelekre\n" "Felbontás" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2848,7 +2855,7 @@ msgstr "" "A kijelölés törlése\n" "Törlés" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2857,7 +2864,7 @@ msgstr "" "Töröl mindent\n" "Mindent töröl" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2866,7 +2873,7 @@ msgstr "" "A kijelölés másolása a vágólapra\n" "Másolás" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2875,7 +2882,7 @@ msgstr "" "A kijelölés kivágása a vágólapra\n" "Kivágás" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2884,7 +2891,7 @@ msgstr "" "A megadott szöveg keresése\n" "Keresés" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2893,7 +2900,7 @@ msgstr "" "A vágólap tartalmának beillesztése\n" "Beillesztés" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2902,7 +2909,7 @@ msgstr "" "Az utolsó mûvelet megismétlése\n" "Ismét" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2911,7 +2918,7 @@ msgstr "" "A megadott szöveg cseréje a kívánt új szöveggel\n" "Csere" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2920,7 +2927,7 @@ msgstr "" "A teljes dokumentum kijelölése\n" "Kijelöl mindent" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2929,7 +2936,7 @@ msgstr "" "Az utolsó mûvelet visszavonása\n" "Visszavonás (Ctrl+Z)" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2938,7 +2945,7 @@ msgstr "" "Az utoljára visszavont mûvelet megismétlése\n" "Mégis (Ctrl+Y)" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2947,7 +2954,7 @@ msgstr "" "Megmutatja vagy elrejti az Eszköztárat\n" "Eszköztár" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2956,69 +2963,69 @@ msgstr "" "Megmutatja vagy elrejti az Állapotsort\n" "Állapotsor" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Az ablak méretének változtatása" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Az ablak pozíciójának változtatása" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Az ablak ikonállapotra kicsinyítése" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Az ablak teljes méretûvé tétele" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Váltás a következõ dokumentum ablakára" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Váltás az elõzõ dokumentum ablakára" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Az aktív ablak bezárása a változtatások mentésének lehetõségével" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Az ablak vissazállítása az eredeti méretére" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "A Feladat Lista aktiválása" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Ennek az ablaknak az aktiválása" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3027,7 +3034,7 @@ msgstr "" "A Nyomtatási elõnézet bezárása\n" "Nyomtatási elõnézet bezárása" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3046,175 +3053,175 @@ msgstr "" "WinMerge.Dokumentum\n" "WinMerge Dokumentum" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Az eredeti újsor-karakterek megõrzése" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Nyomj egy billentyût" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Kattints a jobb egérgombbal az útvonalra annak másolásához" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&Rendben" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Leállít" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Ismét" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Kihagy" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Kihagy M&indent" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Igen" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Igen &mindenre" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Nem" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Nem m&indenre" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Folytatás" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Kihagy" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Kihagy &mindent" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "&Ne jelenjen meg többet ez az üzenet." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "&Ne jelenjen meg többet ez a kérdés." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Szintaxis színek" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Verzió Kontroll" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Verzió %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Opciók (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Minden üzenet ezentúl újra megjelenik." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "A megnyitott összehasonlítási folyamat alatt változtatások történtek. Egyes változtatások akkor lépnek életbe, amikor az éppen folyamatban lévõ összehasonlítás befejezõdik." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A beállított új betûtípus nem lesz érvényes minden egyes ablak felirataira." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3222,7 +3229,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3230,107 +3237,107 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Megnyitás" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programok|*.exe;*.bat;*.cmd|Minden fájl (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Minden fájl (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projekt Fájlok (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1950 +#: Merge.rc:1953 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Teljes tartalmak" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Átfutott tartalmak" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Módosítási dátum" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Név" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Hely" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Szûrõk" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Leírás" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Válassz fájlnevet az új szûrõhöz" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fájl szûrõk (*.flt)|*.flt|Minden fájl (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3339,7 +3346,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3348,7 +3355,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3356,7 +3363,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3365,12 +3372,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3378,208 +3385,208 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "A &cleartool.exe elérési útja:" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "Az &SS.EXE elérési útvonala:" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Könyvtár összehasonlítási eredmények" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Fájl összehasonlítás" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Névtelen bal oldal" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Névtelen jobb oldal" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Fájlok vizsgálata..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Kijelölés megnyitása" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Másolás balról jobbra" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Másolás balról jobbra" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Másolás mindent balra" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Másolás mindent jobbra" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Fájlok másolása..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Fájlok törlése..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Fájlok áthelyezése..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Jelentés készítése..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Sor: %s Oszlop: %d/%d Kar: %d/%d Újsor: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Sor: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Sor: %s Oszlop: %d/%d Kar: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Olvasztás" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Ennyi különség: %1 ennyibõl: %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 különbséget találtam" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 különbséget találtam" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "%1 elem ennyibõl: %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "%1 elem" -#: Merge.rc:2052 +#: Merge.rc:2055 #, 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:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Könytár kiválasztás" -#: Merge.rc:2054 +#: Merge.rc:2057 #, 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:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "A bal oldali elérési út érvénytelen!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "A jobb oldali elérési út érvénytelen!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Mindkét elérési út érvénytelen!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, 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:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Nem lehet fájlt könyvtárral összehasonlítani!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Ez a fájl nem található: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "A fájl nincs kicsomagolva: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3592,7 +3599,7 @@ msgstr "" "\n" "ez két egyezõ bináris fájl." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3605,7 +3612,7 @@ msgstr "" "\n" "ez két különbözõ bináris fájl." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3616,7 +3623,7 @@ msgstr "" "\n" "bináris fájl. Nem lehet bináris fájlokat szöveges fájlokkal összehasonlítani." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3629,37 +3636,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Mentés másként" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Mentsem a változtatásokat %1 néven?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Hiba a cél írhatóságának ellenõrzésekor" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Hiba a fájl biztonsági másolatának készítésekor" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3672,7 +3679,7 @@ msgstr "" "\n" "Folytatni akarod?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3689,7 +3696,7 @@ msgstr "" "\t-másik fájlnév választása (Ok)\n" "\t-a jelenlegi folyamat megszakítása (Mégsem)?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3704,7 +3711,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3719,7 +3726,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3734,7 +3741,7 @@ msgstr "" "\n" "Felülírjuk a megváltoztatott fájlt?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3743,7 +3750,7 @@ msgstr "" "%1\n" "csak olvasható. Szeretnéd ezt megváltoztatni?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3758,17 +3765,17 @@ msgstr "" "\n" "Ha szeretnéd frissíteni a fájl tartalmát, zárd be a jelenlegi munkát és nyisd meg a fájlokat újra." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Bal oldali fájl mentése más néven" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Jobb oldali fájl mentése más néven" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3779,42 +3786,42 @@ msgstr "" "\n" "Frissítsd a dokumentumokat, mielõtt folytatnád." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Fájlok ellenõrzése VSS-bõl..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Hiba a Verzió Rendszer futtatása közben." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Nem található VSS adatbázis!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Hiba a VSS-bõl:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3822,186 +3829,186 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2114 #, 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (régebbi mint 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 vagy újabb)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Megállás szóközöknél" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Megállás szóközöknél vagy írásjeleknél" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Kijelölt bal oldali elem törlése" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Kijelölt jobb oldali elem törlése" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Kijelölt elem(ek) törlése mindkét oldalon" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Kijelölt elem(ek) rejtése (gyors szûrés)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Jobbról balra (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Balról jobbra (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Jobbról balra (%1 of %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Balról jobbra (%1 of %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Balról... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Jobbról... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Balról... (%1 of %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Jobbról... (%1 of %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Bal (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Jobb (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Mindkettõ (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Bal (%1 ennyibõl: %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Jobb (%1 ennyibõl: %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Mindkettõ (%1 ennyibõl: %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Válassz célkönyvtárat" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Bal oldal - válassz úticél mappát:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Jobb oldal - válassz úticél mappát:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Biztos vagy benne, hogy minden eltérést bal fájlba szeretnél másolni?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Biztos vagy benne, hogy minden eltérést a jobb fájlba szeretnél másolni?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4016,17 +4023,17 @@ msgstr "" " másolása ide:\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Biztosan szeretnél %1/%2 elemet átmásolni?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Biztosan szeretnél %1/%2 elemet törölni?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4037,7 +4044,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4048,17 +4055,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4070,458 +4077,458 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Bal oldali fájl megnyitása" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Bal oldali fájl megnyitása a belsõ szerkesztõvel" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Bal oldali fájl megnyitása a(z) ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Jobb oldali fájl megnyitása" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Jobb oldali fájl megnyitása a belsõ szerkesztõvel" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Jobb oldali fájl megnyitása a(z) ..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Fájlnevek másolása a vágólapra" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Bal oldali fájlok útvonalainak másolása a vágólapra" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Jobb oldali fájlok útvonalainak másolása a vágólapra" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Mindkét oldali fájlok útvonalainak másolása a vágólapra" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Ismeretlen archívum formátum" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Bal oldali fájlok hozzáadása az archívumhoz" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Jobb oldali fájlok hozzáadása az archívumhoz" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Mindkét oldali fájlok hozzáadása az archívumhoz" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Különbözõ elemek hozzáadása az archívumhoz (mindkét oldalról)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "A kijelölt bal oldali fájlok áthelyezése tetszõleges könyvtárba" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "A kijelölt jobb oldali fájlok áthelyezése tetszõleges könyvtárba" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Fájlnév" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Könyvtár" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Összehasonlítási eredmények" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Bal oldali dátum" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Jobb oldali dátum" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Kiterjesztés" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Bal oldali méret" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Jobb oldali méret" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Bal oldali létrehozási idõ" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Jobb oldali létrehozási idõ" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Újabb fájl" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Bal oldali fájl verzió" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Jobb oldali fájl verzió" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Rövid eredmények" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Bal oldali attribútumok" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Jobb oldali attribútumok" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Bal oldali kódolás" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Jobb oldali kódolás" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Bináris" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Nem lehett összehasonlítani a fájlokat" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "A fájl kihagyva" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "A könyvtár kihagyva" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "A bináris fájlok megegyezõek" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "A bináris fájlok különbözõek" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "A fájlok különbözõek" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Csak bal oldal" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Csak jobb oldal" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Eltelt idõ: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 elem kiválasztva" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 elem kiválasztva" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "fájlnév vagy könyvtárnév." -#: Merge.rc:2284 +#: Merge.rc:2287 #, 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:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Összehasonlítási eredmény bõvebb formában." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Bal oldali módosítási dátum." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Jobb oldali módosítási dátum." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Fájlok kiterjesztése." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Bal oldali fájl mérete bájtokban." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Jobb oldali fájl mérete bájtokban." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Bal oldal létrehozási ideje." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Jobb oldal létrehozási ideje." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Megmutatja, melyik oldalnak újabb a létrehozási dátuma." -#: Merge.rc:2301 +#: Merge.rc:2304 #, 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:2302 +#: Merge.rc:2305 #, 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:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Rövid összehasonlítási eredmények." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Bal oldali attribútumok." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Jobb oldali attribútumok." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Bal oldali kódolás." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Jobb oldali kódolás." -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "(*) látható, ha a fájl bináris." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "%1 összehasonlítása ezzel: %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Vesszõvel elválasztott lista" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Tabulált lista" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "Egyszerû HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4530,47 +4537,47 @@ msgstr "" "Hiba a jelentés készítése közben:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "A jelentés sikeresen elkészült." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Ugyanaz a fájl van megnyitva mindkét panelen." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "A kijelölt fájlok ugyanazok." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Hiba történt a fájlok összehasonlításakor." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Bináris fájlok nem hasonlíthatóak össze vizuálisan." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Könyvtárak nem hasonlíthatóak össze vizuálisan." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4585,7 +4592,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4596,22 +4603,22 @@ msgstr "" " A jelenlegi beállításokkal a leginkább jellemzõ lesz az alapértelmezett.\n" " Szeretnéd, ha mégis figyelembe venné az eltérõ újsor-karaktereket?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Hiba történt ennek a fájlnak az elõvizsgálata közben: '%1' ebben a bõvítményben: '%2'. Az elõvizsgálat ezután nem fog mûködni." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4622,132 +4629,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Nincs eltérés" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Sor eltérés" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Cserélve lett %1 sztring." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nem található ez: \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Teljes elérési út másolása" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Fájlnév másolása" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "A Patch fájl sikeresen elkészült." -#: Merge.rc:2393 +#: Merge.rc:2396 #, 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:2394 +#: Merge.rc:2397 #, 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:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 kijelölt fájl]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Normál" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Környezeti" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Egységesített" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Nem lehetett ebbe a fájlba írni: %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, 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:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Adj meg egy kimeneti fájlt" -#: Merge.rc:2403 +#: Merge.rc:2406 #, 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:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nem lehet patch fájlt létrehozni könyvtárakból." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4758,17 +4765,17 @@ msgstr "" "\n" "A patch létrehozásához elengedhetetlen, hogy ne legyenek el nem mentett változtatások a fájlokban." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "A mappa nem létezik." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "A jelenlegi könyvtár összehasonlítási eredmények törlõdnek." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4779,51 +4786,51 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4831,1117 +4838,1117 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Reguláris kifejezés hiba" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Nincs találat" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Érvénytelen reguláris kifejezés" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Érvénytelen egyeztetõ karakter" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Érvénytelen karakter osztály név" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Felesleges backslash karakter" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Érvénytelen visszautalás" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Lezáratlan [ vagy [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Lezáratlan ( vagy \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Lezáratlan \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Érvénytelen tartalmú \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Érvénytelen tartomány" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Nincs elég memória" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Érvénytelen megelõzõ reguláris kifejezés" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Korán lezárt reguláris kifejezés" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Túl nagy reguláris kifejezés" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Lezáratlan ) vagy \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albán" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arab (Saudi Arabian)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arab (Iraq)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arab (Egyptian)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arab (Libyan)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arab (Algerian)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arab (Moroccan)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arab (Tunisian)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arab (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arab (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arab (Syrian)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arab (Jordan)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arab (Lebanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arab (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arab (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arab (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arab (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Örmény" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Baszk" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Belorusz" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgár" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Katalán" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Kínai (hagyományos)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Kínai (egyszerûsített)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Kínai (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Kínai (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Kínai (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Horvát" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Cseh" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Dán" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Holland" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Holland (Belgium)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Angol (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Angol (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Angol (Australian)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Angol (Canadian)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Angol (New Zealand)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Angol (Irish)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Angol (So. African)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Angol (Jamaican)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Angol (Caribbean)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Angol (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Angol (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Angol (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Angol (Philippines)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Francia" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Francia (Belgique)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Francia (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Francia (Switzerland)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Francia (Luxembourg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Francia (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Német (Germany)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Német (Switzerland)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Német (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Német (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Német (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Görög" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Héber" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Magyar" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Izlandi" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonéz" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Olasz" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Olasz (Swiss)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japán" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmír (India)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Koreai" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Koreai (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Litván" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Maláj (Malaysian)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Maláj (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norvég (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norvég (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Lengyel" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugál" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugál (Brazil)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Román" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Orosz" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sanszkrit" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Szerb (Latin)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Szerb (Cyrillic)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Szlovák" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Szlovén" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Spanyol" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Spanyol (Mexican)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Spanyol (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Spanyol (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Spanyol (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Spanyol (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Spanyol (Dominican)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Spanyol (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Spanyol (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Spanyol (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Spanyol (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Spanyol (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Spanyol (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Spanyol (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Spanyol (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Spanyol (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Spanyol (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Spanyol (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Spanyol (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Spanyol (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Svéd" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Svéd (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatár (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Török" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ukrán" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Üzbég (Latin)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Üzbég (Cyrillic)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnámi" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Nem alkalmazható" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Bal oldali fájl mentése" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Jobb oldali fájl mentése" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Bal oldali fájl mentése mint ..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Jobb oldali fájl mentése mint ..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Bal oldali fájl/könyvtár csak olvasható állapotának változtatása" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Jobb oldali fájl/könyvtár csak olvasható állapotának változtatása" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Újsor-karakterek kovertálása: DOS mode" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Újsor-karakterek kovertálása: UNIX mode" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Újsor-karakterek kovertálása: MAC mode" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Váltás olvasztó és szerkesztõ mód között" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5950,7 +5957,7 @@ msgstr "" "Ugrás sorra vagy eltérésre\n" "Ugrás (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5959,7 +5966,7 @@ msgstr "" "A program beállítása\n" "Beállítások" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -5968,79 +5975,79 @@ msgstr "" "Kijezõ frissítése\n" "Frissítés (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "A kijelölt sorok vágólapra másolása a sorok elejéhez a sorszámokat hozzáfûzve" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6049,7 +6056,7 @@ msgstr "" "Válaszd ki a kívánt betûtípust\n" "Nézet betûtípusának választása" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6058,27 +6065,27 @@ msgstr "" "Visszatérés az eredeti rendszer-betûtípushoz megjelenítéshez\n" "Alapért. betûtípus" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Szóköz karakterek mutatása" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Eltérés panel mutatása/rejtése" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "A Pozíció panel vizuális képet ad az összehasonlított fájlokról" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6087,7 +6094,7 @@ msgstr "" "Add meg a használni kívánt nyelvet\n" "Nyelv" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6096,43 +6103,43 @@ msgstr "" "A sorok közötti különbségek kijelzés más-más színnel\n" "Sorok eltérésének mutatása" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6141,7 +6148,7 @@ msgstr "" "Görgetés az elõzõ eltéréshez\n" "Elõzõ Eltérés (Alt+Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6150,7 +6157,7 @@ msgstr "" "Görgetés a következõ eltéréshez\n" "Követk Eltérés (Alt+Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6159,7 +6166,7 @@ msgstr "" "Görgetés az elsõ eltéréshez\n" "Elsõ Eltérés (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6168,7 +6175,7 @@ msgstr "" "Görgetés az aktuális eléréshez\n" "Aktuális Eltérés (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6177,7 +6184,7 @@ msgstr "" "Görgetés az utolsó eltéréshez\n" "Utolsó Eltérés (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6186,7 +6193,7 @@ msgstr "" "A kijelölt szöveg másolása a jobb oldali fájlba\n" "Másolás jobbra (Alt+Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6195,7 +6202,7 @@ msgstr "" "A kijelölt szöveg másolása a bal oldali fájlba\n" "Másolás balra (Alt+Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6204,7 +6211,7 @@ msgstr "" "Az eltérés másolása jobbra és ugrás tovább\n" "Másolás jobbra és Ugrás (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6213,7 +6220,7 @@ msgstr "" "Az eltérés másolása balra és ugrás tovább\n" "Másolás balra és Ugrás (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6222,7 +6229,7 @@ msgstr "" "Az összes eltérés másolása jobbra\n" "Mind jobbra" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6231,72 +6238,72 @@ msgstr "" "Az összes eltérés másolása jobbra\n" "Mind balra" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "A kijelölt elemek törlése mindkét könyvtárból" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Kijelölt elem összehasonlítása (elõször az elsõé, ha több elem is ki van jelölve)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Könyvtár összehasonlítási oszlopok kijelölése és újrarendezése" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Patch-file generálása" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Szûrõk kijelölése és módosítása" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Jelentés készítése az összehasonlítási eredményekbõl" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "A felhasználó adja meg a kicsomagolót (nincs kicsomagolás könyvtárak összehasonlításakor)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Válassz kicsomagolót a fájl szerkesztéséhez" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Nincs elõvizsgálat (normális)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Javasolt bõvítmények" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Egyéb bõvítmények" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Az összes bõvítmény betöltése újra (fejlesztõknek)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6305,12 +6312,12 @@ msgstr "" "Következõ látható fájl aktiválása\n" "Következõ fájl aktiválása" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Minden megnyitott ablak bezárása" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6319,296 +6326,301 @@ msgstr "" "A WinMerge Felhasználói Kézikönyv megjelenítése\n" "Súgó" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "A jelenlegi WinMerge verziószámának és egyéb adatainak fájlba mentése" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "A GNU public license megjelenítése" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" "Help Index" msgstr "" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" "Help Search" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Bõvítmény beállítások" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Nincs elõvizsgálat" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Elõvizsgálat ha lehetséges" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "A WSH nem található - Az .sct szkriptek le lesznek tiltva" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "A fájl megnyitása a társított alkalmazással" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "A fájl megnyitása a külsõ szerkesztõvel" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "A fájl megnyitása a kiválasztott programmal" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Ne mutassa a mozgatott blokkokat" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Mutasson minden mozgatott blokkot" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mutassa a kijelölt blokkokat a jelenlegi eltéréstõl kezdve" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Ugrás a kurzor alatt eltérésre" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "&Ugrás a(z) %1. számú eltérésre ennyibõl: %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "&Ugrás a(z) %1. sorra" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Italian.po b/Src/Languages/Italian.po index 7c2803a09..10b749acd 100644 --- a/Src/Languages/Italian.po +++ b/Src/Languages/Italian.po @@ -73,7 +73,7 @@ msgstr "&Taglia" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "C&opia" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "I&ncolla" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&Vai a..." @@ -96,43 +96,43 @@ msgid "Op&en" msgstr "&Apri" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "con l'applicazione ®istrata" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "con l'editor &esterno" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&con..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&File" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Nuovo\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Apri...\tCtrl+A" @@ -148,8 +148,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Apri pro&getto...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Sal&va progetto..." @@ -160,1889 +160,1896 @@ msgid "Recent Projects" msgstr "Progetti recenti" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Esci" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Modifica" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "Op&zioni" #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Visualizza" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "&Carattere..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "&Utilizza carattere predefinito" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "Barra degli s&trumenti" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "&Nessuna" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "&Piccola" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "&Barra di stato" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "&Barra delle schede" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Lingua..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Strumenti" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtri..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Crea patch..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Plugin" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "Scompattazione &manuale" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "Scompattazione &automatica" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "Modi&fica con lo scompattatore" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Ricarica plugin" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "&Debug" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "&Carica configurazione..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "&Reimposta opzioni" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "Fi&nestra" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Chiudi" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Chiudi &tutto" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Cambia &pannello\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Affianca &orizzontalmente" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Affianca &verticalmente" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Sovrapponi" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&?" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Contenuti...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Indice..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "Ce&rca..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "C&onfigurazione..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "&Supporto per gli archivi inattivo..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "Licenza pubblica &GNU..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "Infor&mazioni su WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Apri pro&getto...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Fil&e di sinistra di Sola lettura" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "F&ile di destra di Sola lettura" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "&Codifica dei file" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Se&leziona tutto\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Mostra elementi &identici" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Mostra elementi di&fferenti" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostra elementi unici di &sinistra" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostra elementi unici di &destra" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Mostra elementi sa<ati" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Mostra i file &binari" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "M&ostra elementi nascosti" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Statistic&he del confronto" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "A&ggiorna\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Aggio&rna selezionati\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Unisci" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&nfronta\tInvio" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Differenza successiva\tAlt+Su" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Di&fferenza precedente\tAlt+Giù" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Prima differen&za\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Differenza &corrente\tAlt+Invio" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Ultima differenza\tAlt+Fine" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "C&opia a destra\tAlt+Destra" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Co&pia a sinistra\tAlt+Sinistra" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Elimina\tCanc" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Personalizza colonne..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Genera &rapporto..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Salva\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Sa&lva sinistro" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Salva" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "S&alva con nome..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Salva dest&ro" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "Stam&pa..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "Impos&ta pagina..." -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "Anteprima &di stampa" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Converti caratteri di fine linea a" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "&DOS (CRLF)" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "&UNIX (LF)" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "&MAC (CR)" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modalità 'Unione'\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Annulla\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Ripristina\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Taglia\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "C&opia\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "I&ncolla\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleziona &differenze nella riga\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Tro&va...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Sostit&uisci...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Script" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Vuoto >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Avanzat&e" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copia con numeri di linea\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "Segnali&bri" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Imposta segnalibro\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "Segnalibro successi&vo\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Segnalibro precedente\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Cancella tutti i segnalibri" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Va&i a...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Evidenziazione sintassi" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "&Visualizza spazi bianchi" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Visualizza &differenze nelle linee" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Mostra i &numeri delle righe" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Visualizza &margini" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "A capo a&utomatico" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "Sc&ambia pannelli" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "&Pannello delle differenze" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Pannello della loca&zione" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copia a des&tra e avanza\tAlt+Ctrl+Destra" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copia &a sinistra e avanza\tAlt+Ctrl+Sinistra" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Cop&ia tutto a destra" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "C&opia tutto a sinistra" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "&Confronta" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "Da &Sinistra a Destra" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "Si&nistra in..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "Da &Destra a Sinistra" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "Destra &in..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Sposta" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "Si&nistra in..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "Destra &in..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Elimina" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Sinistra" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Destra" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Entrambi" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "&Rinomina" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "&Nascondi elementi" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "Apri &file di sinistra" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "A&pri file di destra" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&ia percorsi" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Sinistra (%1 su %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Destra (%1 su %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Entrambi (%1 su %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Copia nomi dei fi&le" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "&Zippa" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Sinistra... (%1 su %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Destra... (%1 su %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Entrambi... (%1 su %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Di&fferenze... (%1 su %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "A&ggiorna" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "Copia &percorso completo" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Copia nome del &file" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Impostazioni Prediffer" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&No prediffer" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Prediffer &automatico" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Vai alla &differenza" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Nessun blocco spostato" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Tutti i blocchi spostati" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Blocchi spostati per la differenza &corrente" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Informazioni su WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(Build Privata)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Tutti i diritti riservati." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visita la pagina web di WinMerge!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Hanno contribuito" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Seleziona i file o le cartelle" -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Sinistra:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "S&foglia..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Destra:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "Sf&oglia..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "S&eleziona..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "Scompa&ttatore:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Sele&ziona..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Includi sottocartelle" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Stato:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Annulla" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Aiuto" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "File o cartelle da confrontare" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Database:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Progetto:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Utente:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Password:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Collegamento al progetto VSS di destinazione" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Applica a tutte le voci" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Estrai" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Salva con nome..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Sistema per il versioning" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "Sistema per il &versioning" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Percorso di cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Generale" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Visualizza automaticamente la prima differenza" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Disattiva la schermata iniziale" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "C&hiudi finestra con ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifica &automaticamente i percorsi nella finestra Apri" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "&Permetti l'esecuzione di un'unica istanza del programma" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "Domanda alla c&hiusura di più finestre" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Completamento automatico nella scelta dei file:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Attiva finestra di confronto multiplo per" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Confron&to di cartelle" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Confronto di &file" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Ripristina" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Lingua" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Lingue disponibili:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Trova" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "Tro&va:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Solo &parole intere" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "&Maiuscolo/Minuscolo" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "&Espressione regolare" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "&Fermati alla fine del file" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Direzione" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Su" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "&Giù" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Trova succ." -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Sostituisci" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Sostituisci &con:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "&Fermati alla fine del file" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Sostituisci in" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "Sele&zione" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "T&utto il file" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Sostituisci" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Sost&ituisci tutto" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "Estrai" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Commenti" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "Reinserisci dopo l'estrazione" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Filtri di linee" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Attiva i filtri di linee" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Espressioni regolari (una per riga):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Salva" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "Nuovo" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Modifica" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "Rimuovi" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Colori" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Differenza:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Differenza selezionata:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Sfondo" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Eliminata" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Testo" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Differenza ignorata:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Spostata:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Spostata selezionata:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Differenza di parole:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Diff. parole selezionata:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Predefinito" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Finestra di dialogo" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Posiziona i file eliminati nel cestino" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignora differenze di tempo inferiori a 3 secondi" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integrazione" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Aggiungi al menu contestuale di Explorer" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Atti&va menu avanzato" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "Imposta come predefinita l'inclusione di sottocartelle" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Editor esterno:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "Cartella dei &filtri:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Sfoglia..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Creatore di patch" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "File&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "File&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Sf&oglia..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "&Scambia" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "&Appendi a un file esistente" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "Ris&ultato:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "Sti&le:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Contesto:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Spa&zi bianchi" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "Conf&ronta" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Ignora ca&mbiamenti" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Ig&nora tutto" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ignora lin&ee vuote" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "&Maiuscolo/Minuscolo" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Includi &linea di comando" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Apri in un e&ditor esterno" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Scelta delle colonne" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Seleziona scompattatore" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Scompattatore di file:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Visualizza tutti gli scompattatori, non verificare l'estensione" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Lista delle estensioni:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Descrizione:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr " Progresso del confronto tra cartelle" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Confronto in corso..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Elementi confrontati:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Totale elementi:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Vai a" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "Va&i a:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "File" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Vai a ..." -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "Li&nea" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "Di&fferenza" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Vai" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Confronto" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Spazi bianchi" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "&Confronta" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "&Ignora cambiamenti" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "I&gnora tutto" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ign&ora le linee vuote" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ig&nora le differenze tra maiuscole e minuscole" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Igno&ra le differenze di carriage return (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Attiva il rilevamento di blocc&hi spostati" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "&Metti in corrispondenza linee simili" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "&Metodo confronto file:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "&Fermati dopo la prima differenza" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Filtra i commenti" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Evidenzia sintassi" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Riscansiona &automaticamente" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "&Conserva caratteri di fine linea originali" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulazioni" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Dimensioni:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "&Inserisci tabulazioni" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "In&serisci spazi" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Colorazione delle differenze di linea" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Mostra differenze di linea" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "Livello &caratteri" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "Livello &parole:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filtri di file" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Prova" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Installa..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Nuovo..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Modifica..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Elimina..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Salvare i file modificati?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "File sul lato sinistro" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Salva le modifiche" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "S&carta le modifiche" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "File sul lato destro" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "S&alva le modifiche" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Sca&rta le modifiche" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Scarta tutto" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Codice di pagina" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Codice di pagina predefinito" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" "need to restart session" msgstr "Rileva le informazione sul codice di pagina per i file .html, .rc, .xml - necessario riavvio della sessione" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Codice di pagina del sistema" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "In accordo con l'interfaccia di WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Codice personalizzato:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Supporto per gli archivi inattivo" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Impossibile rilevare la versione di 7-Zip (forse non è installato?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "Il supporto per gli archivi all'interno dell'applicazione richiede l'installazione di 7-Zip 3.11 o superiore, o che le sue componenti essenziali siano copiate nella cartella del programma." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Ci deve essere un plugin appropriato (Merge7z*.dll) in questo percorso." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2051,12 +2058,12 @@ msgstr "" "Utilizza per favore la versione di 7-Zip raccomandata qui sotto fino alla disponbilità di\n" "nuove versioni." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Versione" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2065,54 +2072,54 @@ msgstr "" "Plugin richiesto\n" "(build dll %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Versione raccomandata di 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "presente" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip installato sul tuo computer:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "nessuno" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "mancante" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componenti 7-Zip per operazioni standalone:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "non aggiornato" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Plugin trovati nel percorso:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2121,486 +2128,486 @@ msgstr "" "Non visualizzare più questo &messaggio.\n" "(Potrai richiamarlo comunque dal menu di aiuto.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Scarica plugin" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Opzioni" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Categorie" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Importa..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Esporta..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Parole chiave:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Nomi funzioni:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Commenti:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Numeri:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operatori:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Stringhe:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Preprocessore:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Utente 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Utente 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Grassetto" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Rapporto sul confronto tra cartelle" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "&File di rapporto:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Stile:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Copia negli appunti" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Filtro privato o condiviso" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Che genere di filtro desideri creare?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro condiviso (per tutti gli utenti su questa macchina)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privato (solo per l'utente corrente)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Supporto per gli archivi" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Il supporto per gli archivi richiede l'installazione del plugin per 7-Zip:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Scarica il plugin per 7-Zip" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Attiva il supporto per i file di archivio" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Utilizza installazione standard di 7-Zip se disponibile" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&tilizza 7-Zip posizionato nella cartella di WinMerge" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Rileva il tipo di archivio dalla firma del file" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Statistiche del confronto" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Cartelle:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "File:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Diversi" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Testo:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binari:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Unici" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Sinistra:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Destra:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identici" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Totale:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Chiudi" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Coinvolge" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Coinvolge)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Scegli codice di pagina per" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "Caricamento &file:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "&Salvataggio file:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&Usa lo stesso codice di pagina per entrambi" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "&Applica" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "Annu&lla" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Prova del filtro" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Filtro in prova ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Inserisci testo di prova:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Nome cartella" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Risultato:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "&Prova" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Chiudi" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&Utilizza colori personalizzati per il testo" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Colori personalizzati per il testo" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Spazi bianchi:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Testo normale:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Selezione:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Percorsi" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Sola &lettura" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Sola lett&ura" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Apri..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Salva..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "File di backup" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Crea copie dei file per:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Crea le copie dei file in:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "Cartella &originaria del file" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "Cartella &globale di backup:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Nome della copia:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "&Aggiungi l'estensione .bak" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "Aggiungi il ×tamp" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "Conferma la copia" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Sei sicuro di voler copiare XXX elementi?" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "Da sinistra" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "A destra" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Sì" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "No" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041004e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Andrea Decorte(aka Klenje), previously by Michele Merega" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x410, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "EST" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "MA" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "BS" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "SSC" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "REG" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2609,7 +2616,7 @@ msgstr "" "Crea due nuovi documenti vuoti\n" "Nuovi documenti (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2618,7 +2625,7 @@ msgstr "" "Apre un documento esistente\n" "Apri" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2627,7 +2634,7 @@ msgstr "" "Chiude il documento attivo\n" "Chiudi" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2636,7 +2643,7 @@ msgstr "" "Salva il documento attivo\n" "Salva" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2645,7 +2652,7 @@ msgstr "" "Salva il documento attivo con un nuovo nome\n" "Salva con nome" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2654,7 +2661,7 @@ msgstr "" "Modifica le impostazioni di stampa\n" "Imposta pagina" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2663,7 +2670,7 @@ msgstr "" "Modifica le impostazioni relative alla stampante e alla stampa\n" "Imposta stampante" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2672,7 +2679,7 @@ msgstr "" "Stampa il documento attivo\n" "Stampa" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2681,12 +2688,12 @@ msgstr "" "Visualizza le pagine per intero\n" "Anteprima di stampa" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Rende nuovamente visibili tutti gli oggetti nascosti" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2695,32 +2702,32 @@ msgstr "" "Apre un file di progetto\n" "File di progetto (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Errore sconosciuto provando a aprire il file di progetto" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Errore sconosciuto provando a salvare il file di progetto" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "File di progetto" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "File di progetto caricato con successo." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "File di progetto salvato con successo." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2729,7 +2736,7 @@ msgstr "" "Salva i percorsi correnti e le opzioni in un file di progetto\n" "Salva il file di progetto" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2738,7 +2745,7 @@ msgstr "" "Visualizza le informazioni sul programma, il numero di versione e le informazioni di copyright\n" "Informazioni su" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2747,9 +2754,6 @@ msgstr "" "Esce dall'applicazione e chiede di salvare i documenti\n" "Esci" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2763,11 +2767,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Apre questo documento" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2776,7 +2783,7 @@ msgstr "" "Passa al riquadro della finestra successivo\n" "Riquadro successivo" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2785,7 +2792,7 @@ msgstr "" "Ritorna al riquadro della finestra precedente\n" "Riquadro precedente" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2794,7 +2801,7 @@ msgstr "" "Apre un'altra finestra per il documento attivo\n" "Nuova finestra" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2803,7 +2810,7 @@ msgstr "" "Dispone le icone nella parte inferiore della finestra\n" "Disponi icone" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2812,7 +2819,7 @@ msgstr "" "Dispone le finestre sovrapponendole\n" "Sovrapponi finestre" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2821,7 +2828,7 @@ msgstr "" "Dispone le finestre in orizzontale senza sovrapporle\n" "Affianca finestre in orizzontale" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2830,7 +2837,7 @@ msgstr "" "Dispone le finestre in verticale senza sovrapporle\n" "Affianca finestre in verticale" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2839,7 +2846,7 @@ msgstr "" "Divide la finestra attiva in riquadri\n" "Dividi" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2848,7 +2855,7 @@ msgstr "" "Cancella la selezione\n" "Cancella" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2857,7 +2864,7 @@ msgstr "" "Cancella tutto\n" "Cancella tutto" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2866,7 +2873,7 @@ msgstr "" "Copia la selezione e la pone negli Appunti\n" "Copia" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2875,7 +2882,7 @@ msgstr "" "Taglia la selezione e la pone negli Appunti\n" "Taglia" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2884,7 +2891,7 @@ msgstr "" "Trova il testo specificato\n" "Trova" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2893,7 +2900,7 @@ msgstr "" "Inserisce il contenuto degli Appunti\n" "Incolla" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2902,7 +2909,7 @@ msgstr "" "Ripete l'ultima azione\n" "Ripeti" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2911,7 +2918,7 @@ msgstr "" "Sostituisce il testo specificato con un testo differente\n" "Sostituisci" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2920,7 +2927,7 @@ msgstr "" "Seleziona l'intero documento\n" "Seleziona tutto" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2929,7 +2936,7 @@ msgstr "" "Annulla l'ultima azione\n" "Annulla" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2938,7 +2945,7 @@ msgstr "" "Ripristina l'azione precedentemente annullata\n" "Ripristina" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2947,7 +2954,7 @@ msgstr "" "Mostra o nasconde la barra degli strumenti\n" "Mostra/nascondi barra degli strumenti" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2956,7 +2963,7 @@ msgstr "" "Mostra o nasconde la barra di stato\n" "Mostra/nascondi barra di stato" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2965,62 +2972,62 @@ msgstr "" "Mostra o nasconde la barra delle schede\n" "Mostra/nascondi barra delle schede" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Modifica le dimensioni della finestra" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Modifica la posizione della finestra" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Riduce la finestra ad icona" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Allarga la finestra a tutto schermo" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Passa alla finestra successiva del documento " -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Passa alla finestra precedente del documento" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Chiude la finestra attiva e chiede di salvare i documenti" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Ripristina la finestra alle dimensioni normali" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Attiva l'elenco dei task" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Attiva questa finestra" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3029,7 +3036,7 @@ msgstr "" "Chiude la modalità anteprima di stampa\n" "Annulla anteprima" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3048,23 +3055,23 @@ msgstr "" "WinMerge.Document\n" "Documento di WinMerge" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Conserva caratteri di fine linea originali" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Premi qualsiasi pulsante" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Clicca con il tasto destro sul percorso per copiare" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3073,152 +3080,152 @@ msgstr "" "Sviluppatori:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "WinMerge non offre ASSOLUTAMENTE NESSUNA GARANZIA. Questo è software libero e sei il benvenuto se desideri ridistribuirlo sotto certe condizioni; guarda la Licenza pubblica GNU nel menu per ulteriori dettagli." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Termina" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Riprova" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignora" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Ignora t&utto" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Sì" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Sì a &tutto" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&No" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "No a t&utto" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Continua" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Salta" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "S&alta tutto" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Non visualizzare questo &messaggio di nuovo." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Non farmi più &questa domanda." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Colori della sintassi" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Colori del testo" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Controllo versioni" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "Da sinistra:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "A sinistra:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "Da destra:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "A destra:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Versione %1 - Italiano" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Opzioni (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Tutti i messaggi di avviso vengono ora visualizzati nuovamente." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Sono state effettuate modifiche ai file dell'attuale sessione di confronto. Alcune impostazioni potrebbero non venire applicate fino al riavvio del confronto corrente tra file." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Il carattere selezionato non sarà utilizzato nelle finestre di visualizzazione delle differenze attualmente attive." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3229,7 +3236,7 @@ msgstr "" "\n" "Utilizza per favore un valore compreso tra 1 e %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3240,107 +3247,107 @@ msgstr "" "\n" "Riavvia per favore WinMerge al termine di questa operazione." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Apri" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmi|*.exe;*.bat;*.cmd|Tutti i file (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tutti i file (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "File di progetto di WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "File delle opzioni (*.ini)|*.ini|Tutti i file (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "File HTML (*.htm,*.html)|*.htm;*.html|Tutti i file (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Contenuti completi" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Contenuti rapidi" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Data ultima modifica" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Data ultima modifica e dimens." -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Dimensioni" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Percorso" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtri" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Descrizione" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Inserisci il nome del file per il nuovo filtro" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtri di file (*.flt)|*.flt|Tutti i file (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3353,7 +3360,7 @@ msgstr "" "Copia per favore il file %1 nella cartella WinMerge/Filters :\n" "%2." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3366,7 +3373,7 @@ msgstr "" "\n" "Assicurati che questa cartella esista e si abbiano i permessi di scrittura." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3377,7 +3384,7 @@ msgstr "" "\n" "Scegli per favore una cartella per i filtri in Opzioni->Sistema." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3390,12 +3397,12 @@ msgstr "" "\n" "Il file potrebbe essere di sola lettura." -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Scegli il file con il filtro da installare" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3406,208 +3413,208 @@ msgstr "" "\n" "Impossibile copiare il nuovo file nella cartella dei filtri." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Il file del filtro esiste già. Desideri sovrascrivere il file esistente?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Espressione regolare" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Percorso di cleartool.exe:" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Percorso di SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Risultati del confronto tra cartelle" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Confronto tra file" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "File di sinistra senza titolo" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "File di destra senza titolo" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Scansione file in corso..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Apertura selezione" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Copia da sinistra a destra in corso" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Copia da destra a sinistra in corso" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Copia completa a sinistra in corso" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Copia completa a destra in corso" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Copia dei file in corso..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Eliminazione dei file in corso..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Spostamento dei file in corso..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Creazione del rapporto in corso..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ln: %s Col: %d/%d Car: %d/%d EOL: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Linea: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Car: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Unione" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Differenza %1 su %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 differenze trovate" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 differenza trovata" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Elemento %1 su %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Elementi: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleziona due cartelle o file esistenti da confrontare" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Selezione cartella" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleziona due cartelle o due file da confrontare." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Il percorso di sinistra non è valido!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Il percorso di destra non è valido!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Entrambi i percorsi non sono validi!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleziona due file per attivare la selezione dello scompattatore." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossibile confrontare file e cartelle!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "File non trovato: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "File non scompattato: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3620,7 +3627,7 @@ msgstr "" "\n" "sono file binari identici." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3633,7 +3640,7 @@ msgstr "" "\n" "sono file binari diversi." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3644,7 +3651,7 @@ msgstr "" "\n" "è un file binario. Impossibile confrontare un file binario e uno di testo." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3657,37 +3664,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Salva con nome" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Vuoi salvare le modifiche in %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Errore nel controllo sui permessi di scrittura della destinazione" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Errore durante il salvataggio di una copia di backup del file" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3700,7 +3707,7 @@ msgstr "" "\n" "Continuare comunque?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3717,7 +3724,7 @@ msgstr "" "\t-utilizzare un nome diverso per il file (Premi OK)\n" "\t-annullare l'operazione corrente (Premi Annulla)?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3732,7 +3739,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3747,7 +3754,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3762,7 +3769,7 @@ msgstr "" "\n" "Sovrascrivere il file modificato?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3771,7 +3778,7 @@ msgstr "" "%1\n" "è marcato come di sola lettura. Desideri non tenere conto della voce di Sola lettura?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3786,17 +3793,17 @@ msgstr "" "\n" "Se vuoi aggiornare i file chiudi l'attuale sessione di confronto e ricarica i file." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Salva il file di sinistra con nome" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Salva il file di destra con nome" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3807,42 +3814,42 @@ msgstr "" "\n" "Aggiorna i documenti prima di continuare." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Estrazione dei file da VSS in corso..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Errore nell'esecuzione di un comando del sistema di versioning." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Nessun database di VSS trovato!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Errore di VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3853,7 +3860,7 @@ msgstr "" " Controlla per favore la configurazione della vista utilizzata.\n" " Annullare l'operazione di estrazione?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3862,179 +3869,179 @@ 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Nessuno" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (precedente a 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superiore)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Interrompi agli spazi bianchi" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Interrompi agli spazi bianchi o punteggiatura" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Copia elemento selezionato in una cartella specifica" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Copia elemento selezionato in una cartella personalizzata" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Elimina la voce selezionata sulla sinistra" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Elimina la voce selezionata sulla destra" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Elimina gli elementi selezionati in entrambi i lati" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Nascondi gli elementi selezionati (filtro al volo)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Rinomina gli elementi selezionati su entrambi i lati" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Da Destra a Sinistra (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Da Sinistra a Destra (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da Destra a Sinistra (%1 su %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da Sinistra a Destra (%1 su %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Sinistra in... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Destra in... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Sinistra in... (%1 su %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Destra in... (%1 su %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Sinistra (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Destra (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Entrambi (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Sinistra (%1 su %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Destra (%1 su %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Entrambi (%1 su %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Scegli cartella di destinazione" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Lato sinistro - scegli cartella di destinazione:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Lato destro - scegli cartella di destinazione:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 file coinvolti)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 file su %2 coinvolti)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Sei sicuro di voler copiare tutte le differenze dal file di destra a quello di sinistra?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Sei sicuro di voler copiare tutte le differenze dal file di sinistra a quello di destra?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4049,17 +4056,17 @@ msgstr "" "in\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Sei sicuro di voler copiare %1 elemento(i) selezionato(i) su %2 ?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Sei sicuro di voler eliminare %1 elemento(i) selezionato(i) su %2 ?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4070,7 +4077,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4081,17 +4088,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Sei sicuro di voler copiare:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Sei sicuro di voler copiare %d elementi:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4110,458 +4117,458 @@ msgstr "" "\n" "Aggiorna per favore il confronto." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Apre il file di sinistra" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Apre il file di sinistra con l'editor esterno" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Apre il file di sinistra con..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Apre il file di destra" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Apre il file di destra con l'editor esterno" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Apre il file di destra con..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Impossibile lanciare l'editor esterno: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Estensione sconosciuta per l'editor esterno: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Copia i nomi dei file negli appunti" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copia i percorsi del lato sinistro negli appunti" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copia i percorsi del lato destro negli appunti" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copia i percorsi di entrambi i lati negli appunti" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Formato dell'archivio sconosciuto" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Aggiunge elementi del lato sinistro a un archivio" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Aggiunge elementi del lato destro a un archivio" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Aggiunge elementi di entrambi i lati a un archivio" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Aggiunge gli elementi diversi a un archivio (entrambi i lati)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Sposta il file selezionato sulla sinistra in una cartella personalizzata" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Sposta il file selezionato sulla destra in una cartella personalizzata" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Nome del file" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Cartella" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Risultato del confronto" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Data file di sinistra" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Data file di destra" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Estensione" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Dimensioni file di sinistra" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Dimensioni file di destra" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Data creazione file sinistra" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Data creazione file destra" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "File più recente" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Versione file sinistra" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Versione file destra" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Risultato breve" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Attributi sinistra" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Attributi destra" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "EOL di sinistra" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "EOL di destra" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Codifica di sinistra" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Codifica di destra" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Diff. ignorate" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Differenze" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binario" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Impossibile confrontare i file" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Elemento annullato" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "File saltato" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Cartella saltata" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Solo sinistra: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Solo destra: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "I file binari sono identici" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "I file non di testo contengono delle differenze" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "I file contengono delle differenze" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Solo a sinistra" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Solo a destra" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "Errore" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo trascorso: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 elemento selezionato" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 elementi selezionati" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Nome del file o della cartella." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome della sottocartella quando le sottocartelle sono incluse." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Risultato del confronto nella forma completa." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Data ultima modifica del file di sinistra." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Data ultima modifica del file di destra." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Estensione del file." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Dimensioni del file di sinistra in byte." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Dimensioni del file di destra in byte." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Dimensioni abbreviate del file di sinistra." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Dimensioni abbreviate del file di destra." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Data e ora di creazione del file di sinistra." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Data e ora di creazione del file di destra." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Mostra quale file ha la data dell'ultima modifica più recente." -#: Merge.rc:2301 +#: Merge.rc:2304 #, 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:2302 +#: Merge.rc:2305 #, 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:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Risultato del confronto nella forma breve." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Attributi del file di sinistra." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Attributi del file di destra." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Tipo di fine linea nel file di sinistra" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Tipo di fine linea nel file di destra" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Codifica del file di sinistra." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Codifica del file di destra." -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisco (*) se il file è binario." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Confronto di %1 con %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Lista separata da virgole" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Lista separata da Tab" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "HTML semplice" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "XML semplice" -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4570,47 +4577,47 @@ msgstr "" "Errore nella creazione del rapporto:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Il rapporto è stato creato con successo." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Lo stesso file è aperto in entrambi i pannelli." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "I file selezionati sono identici." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "La cartella selezionata esiste solo nell'altro lato per cui non può essere aperta." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Si è verificato un errore durante il confronto dei file." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "I file di tipo binario non possono essere confrontati visualmente." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "I file di cartelle non possono essere confrontate visivamente." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4625,7 +4632,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4636,22 +4643,22 @@ msgstr "" "Con le opzioni correnti, essi verranno unificati nel tipo principale.\n" "Desideri cambiare le opzioni e conservare gli EOL diversi?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "C'è stato un errore nel prediffing del file '%1' con il plugin '%2'. Il prediffing non verrà più applicato." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "La cartella selezionata non è valida." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossibile aprire il file binario nell'editor." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4662,132 +4669,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Attenzione: i file usano codifiche differenti, sinistra=%s e destra=%s, e l'unione può causare una perdita di informazioni." -#: Merge.rc:2356 +#: Merge.rc:2359 #, 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:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informazioni perse a causa di errori nella codifica: file di destra" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informazioni perse a causa di errori nella codifica: file di sinistra" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Nessuna differenza" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Differenza della linea" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 stringhe sostituite." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Impossibile trovare la stringa '%s'" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Copia percorso completo" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Copia nome del file" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Pannello della locazione" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Pannello delle differenze" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "File di patch scritto con successo." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "Prima voce non trovata o è una cartella!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "Seconda voce non trovata o è una cartella!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 file selezionati]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Normale" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Contesto" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Unificato" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Impossibile scrivere nel file %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, 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:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Specifica un file di output" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Impossibile creare un file di patch da file binari." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossibile creare un file di patch da cartelle." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4798,17 +4805,17 @@ msgstr "" "\n" "La creazione di una patch richiede che non ci siano cambiamenti non salvati nei file." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "La cartella non esiste." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Gli attuali risultati del confronto tra cartelle verranno cancellati." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4819,7 +4826,7 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4828,7 +4835,7 @@ msgstr "" "\n" "Nota: l'integrazione con 7-Zip è stata disattivata nelle opzioni di WinMerge." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4837,37 +4844,37 @@ msgstr "" "\n" "Note: l'integrazione con 7-Zip è limitata a una installazione indipendente nelle opzioni di WinMerge." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Scegli file per l'esportazione" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Scegli file per l'importazione" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Opzioni importate dal file." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Opzioni esportate nel file." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Impossibile importare le opzioni dal file." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Impossibile esportare le opzioni nel file." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4878,1098 +4885,1098 @@ msgstr "" "\n" "Sei sicuro di voler proseguire?" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Errore nell'espressione regolare" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Nessuna corrispondenza" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Espressione regolare non valida" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Carattere di collazione non valido" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Carattere del nome della classe non valido" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Backslash che seguono" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Referenza inversa non valida" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Parentesi [ o [^ isolata" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Parentesi ( o \\( isolata" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Parentesi \\{ isolata" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Contenuto di \\{\\} non valido" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Conclusione del range non valida" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Out of memory" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Espressione regolare precedente non valida" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Conclusione prematura dell'espressione regolare" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Espressione regolare troppo grande" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Parentesi ) o \\) isolata" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Afrikaans" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanese" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabo (Arabia Saudita)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabo (Iraq)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabo (Egitto)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabo (Libia)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabo (Algeria)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabo (Marocco)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabo (Tunisia)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabo (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabo (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabo (Siria)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabo (Giordania)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabo (Libano)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabo (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabo (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabo (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabo (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armeno" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azero (latino)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azero (cirillico)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Basco" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Bielorusso" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgaro" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalano" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Cinese (tradizionale)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Cinese (semplificato)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Cinese (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Cinese (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Cinese (Macao SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Croato" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Ceco" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Danese" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Olandese" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Olandese (Belgio)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Inglese (USA)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Inglese (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Inglese (Australia)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Inglese (Canada)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Inglese (Nuova Zelanda)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Inglese (Irlanda)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Inglese (Sud Africa)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Inglese (Giamaica)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Inglese (Carabi)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Inglese (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Inglese (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Inglese (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Inglese (Filippine)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Estone" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Faroese" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Farsi" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Finlandese" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Francese" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Francese (Belgio)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Francese (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Francese (Svizzera)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Francese (Lussemburgo)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Francese (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgiano" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Tedesco (Germania)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Tedesco (Svizzera)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Tedesco (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Tedesco (Lussemburgo)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Tedesco (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Greco" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Ebraico" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Hindi" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Ungherese" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Islandese" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesiano" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italiano" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italiano (Svizzera)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Giapponese" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmiri (India)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Kazaco" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Coreano" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Coreano (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Lettone" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lituano" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malese (Malesia)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malese (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "Manipuri" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norvegese (Bokmål)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norvegese (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polacco" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portoghese" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portoghese (Brasile)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Rumeno" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russo" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sanscrito" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbo (latino)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbo (cirillico)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "Sindhi" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Slovacco" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Sloveno" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Spagnolo" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Spagnolo (Messico)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Spagnolo (moderno)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Spagnolo (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Spagnolo (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Spagnolo (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Spagnolo (Rep. Dominicana)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Spagnolo (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Spagnolo (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Spagnolo (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Spagnolo (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Spagnolo (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Spagnolo (Cile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Spagnolo (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Spagnolo (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Spagnolo (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Spagnolo (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Spagnolo (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Spagnolo (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Spagnolo (Porto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Kenya)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Svedese" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Svedese (Finlandia)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tamil" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tartaro (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Thailandese" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turco" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ucraino" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "Urdu (Pakistan)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (India)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbeco (latino)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbeco (cirillico)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamita" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Europa occidentale" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Europa orientale" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Asia orientale" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "Asia sud orientale e sud occidentale" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Medio oriente" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Non applicabile" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cirillico" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latino USA" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabo" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greco" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltico" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latino 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greco 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latino 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cirillico" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turco" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portoghese" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandese" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Ebraico" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Canada francofono" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordico" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cirillico CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greco 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Thailandese" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Giapponese" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Cinese semplificato" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Coreano" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Cinese tradizionale" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Latino 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cirillico (Slavo)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Latino 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Greco" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latino 5 (Turco)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Ebraico" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Arabo" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltico" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamita" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Latino" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greco" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cirillico" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "Macintosh Europa centrale" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Islandese" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turco" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Approssima a ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Approssima a ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Approssima a ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Approssima a ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Approssima a ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Mescolato" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Salva il file di sinistra" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Salva il file di destra" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Salva il file di sinistra con nome..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Salva il file di destra con nome..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Cambia lo stato di Sola lettura del file/cartella di sinistra" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Cambia lo stato di Sola lettura del file/cartella di destra" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Converti gli EOL (End of line) in formato DOS" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Converti gli EOL (End of line) in formato UNIX" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Converti gli EOL (End of line) in formato MAC" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Passa dalla modalità di editing a quella di 'Unione', in cui l'integrazione delle differenzeè più rapida" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5978,12 +5985,12 @@ msgstr "" "Visualizza e regola le proprietà della codifica dei file\n" "Proprietà della codifica dei file" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5992,7 +5999,7 @@ msgstr "" "Seleziona l'area della differenza nella linea corrente\n" "Differenza nella linea corrente" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6001,7 +6008,7 @@ msgstr "" "Vai a una linea o una differenza\n" "Vai a (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6010,7 +6017,7 @@ msgstr "" "Imposta le opzioni del programma\n" "Opzioni" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6019,37 +6026,37 @@ msgstr "" "Aggiorna la visualizzazione\n" "Aggiorna (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copia le linee selezionate negli Appunti aggiungendo i numeri di linea all'inizio" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Aggiorna gli elementi selezionati" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Imposta un segnalibro" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Va al segnalibro successivo" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Va al segnalibro precedente" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Cancella tutti i segnalibri" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6058,7 +6065,7 @@ msgstr "" "Mostra gli elementi che sono completamente identici\n" "Mostra elementi identici" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6067,7 +6074,7 @@ msgstr "" "Mostra gli elementi che hanno delle differenze\n" "Mostra elementi differenti" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6076,7 +6083,7 @@ msgstr "" "Mostra gli elementi che esistono solo sul lato sinistro\n" "Mostra elementi unici a sinistra" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6085,7 +6092,7 @@ msgstr "" "Mostra gli elementi che esistono solo sul lato destro\n" "Mostra elementi unici a destra" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6094,7 +6101,7 @@ msgstr "" "Mostra i file binari\n" "Mostra i file binari" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6103,7 +6110,7 @@ msgstr "" "Mostra gli elementi saltati\n" "Mostra gli elementi saltati" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6112,7 +6119,7 @@ msgstr "" "Seleziona il carattere per la visualizzazione\n" "Seleziona carattere visualizzazione" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6121,27 +6128,27 @@ msgstr "" "Ripristina il carattere predefinito del sistema per la visualizzazione\n" "Carattere predefinito" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Mostra gli spazi bianchi" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Mostra il pannello delle differenze" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Il pannello della locazione mostra un'immagine complessiva dei file" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostra la finestra con le statistiche del confronto tra cartelle" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6150,7 +6157,7 @@ msgstr "" "Seleziona la lingua dell'interfaccia utente\n" "Lingua" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6159,12 +6166,12 @@ msgstr "" "Mostra le differenze all'interno delle linee con colori diversi\n" "Mostra differenze nelle linee" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Scambia le posizioni dei due pannelli" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6173,7 +6180,7 @@ msgstr "" "Mostra i numeri delle righe\n" "Mostra numeri delle righe" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6182,7 +6189,7 @@ msgstr "" "Vai a capo automaticamente\n" "Va a capo automaticamente (word wrap)" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6191,17 +6198,17 @@ msgstr "" "Mostra i margini di selezione per entrambi i pannelli\n" "Mostra margini di selezione" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6210,7 +6217,7 @@ msgstr "" "Visualizza la differenza precedente\n" "Differenza precedente (Alt+Giù)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6219,7 +6226,7 @@ msgstr "" "Visualizza la differenza successiva\n" "Differenza successiva (Alt+Su)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6228,7 +6235,7 @@ msgstr "" "Scorre fino alla prima differenza\n" "Prima differenza (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6237,7 +6244,7 @@ msgstr "" "Scorre fino alla differenza corrente\n" "Differenza corrente (Alt+Invio)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6246,7 +6253,7 @@ msgstr "" "Scorre fino all'ultima differenza\n" "Ultima differenza (Alt+Fine)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6255,7 +6262,7 @@ msgstr "" "Copia il testo selezionato dal file di sinistra a quello di destra\n" "Copia a destra (Freccia destra)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6264,7 +6271,7 @@ msgstr "" "Copia il testo selezionato dal file di destra a quello di sinistra\n" "Copia a sinistra (Freccia sinistra)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6273,7 +6280,7 @@ msgstr "" "Copia la differenza a destra e avanza alla prossima\n" "Copia a destra e avanza (Ctrl+Alt+Destra)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6282,7 +6289,7 @@ msgstr "" "Copia la differenza a sinistra e avanza alla prossima\n" "Copia a sinistra e avanza (Ctrl+Alt+Sinistra)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6291,7 +6298,7 @@ msgstr "" "Copia tutte le differenze dal file di sinistra a quello di destra\n" "Tutto a destra" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6300,72 +6307,72 @@ msgstr "" "Copia tutte le differenze dal file di destra a quello di sinistra\n" "Tutto a sinistra" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Elimina gli elementi selezionati da entrambe le cartelle" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Confronta l'elemento selezionato (confronta il primo elemento se ne sono stati selezionati più di uno)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleziona e riordina le colonne da visualizzare nei confronti tra cartelle" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Crea un file di patch" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Seleziona e modifica i filtri" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Genera un rapporta con i risultati del confronto" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "L'utente seleziona lo scompattore (nessuna scompattazione nel confronto tra cartelle)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleziona uno scomapattatore per modificare questo file" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "No prediffer (normale)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Plugin suggeriti" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Altri plugin" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Scarica tutti i plugin e ricaricali (per sviluppatori)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6374,12 +6381,12 @@ msgstr "" "Attiva il prossimo file visibile\n" "Attiva il prossimo file" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Chiude tutte le finestre aperte" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6388,22 +6395,22 @@ msgstr "" "Visualizza il manuale utente di WinMerge\n" "Manuale utente" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Invia le informazioni sulla versione e la configurazione corrente di WinMerge a un file di testo" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Visualizza la licenza pubblica GNU" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Build privata: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6412,7 +6419,7 @@ msgstr "" "Apre l'indice della guida di WinMerge\n" "Indice della guida" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6421,267 +6428,272 @@ msgstr "" "Apre la ricerca nella guida di WinMerge\n" "Ricerca nella guida" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Impostazioni plugin" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "No prediffer" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Prediff se possibile" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH non trovato - script .sct disattivati" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Apri il file con l'applicazione registrata per esso" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Apri il file con l'editor esterno" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Apri il file con un programma specifico" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Non visualizzare i blocchi spostati" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Visualizza tutti i blocchi spostati" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Visualizza i blocchi spostati solo dalla differenza corrente" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Vai alla differenza all'altezza del cursore" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Vai alla &differenza %1 su %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "Vai alla &linea %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Disattivato" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Dal file system" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Dalla lista dei file recenti" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "Risorse" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Nascondi la barra degli strumenti" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Mostra barra degli strumenti piccola" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Mostra barra degli strumenti grande" diff --git a/Src/Languages/Japanese.po b/Src/Languages/Japanese.po index 100d5e4c5..724193104 100644 --- a/Src/Languages/Japanese.po +++ b/Src/Languages/Japanese.po @@ -71,7 +71,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "ƒRƒs[(&C)" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "“\‚è•t‚¯(&P)" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "ˆÚ“®(&G)..." @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "ŠJ‚­(&E)" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "“o˜^‚³‚ꂽƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚Å(&R)" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚Å(&E)" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "ƒvƒƒOƒ‰ƒ€‚Ì‘I‘ð(&W)..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "ƒtƒ@ƒCƒ‹(&F)" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "V‹Kì¬(&N)\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "ŠJ‚­(&O)...\tCtrl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "ƒvƒƒWƒFƒNƒg‚ðŠJ‚­(&J)...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "ƒvƒƒWƒFƒNƒg‚ð•Û‘¶(&V)..." @@ -158,1845 +158,1852 @@ msgid "Recent Projects" msgstr "Å‹ßŽg—p‚µ‚½ƒvƒƒWƒFƒNƒg" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "I—¹(&X)" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "•ÒW(&E)" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "Ý’è(&O)..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "•\Ž¦(&V)" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "ƒtƒHƒ“ƒg‘I‘ð(&F)..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "ƒfƒtƒHƒ‹ƒgƒtƒHƒ“ƒg‚ðŽg—p(&O)" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "ƒc[ƒ‹ƒo[(&T)" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "‚È‚µ(&N)" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "¬(&S)" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "‘å(&B)" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "ƒXƒe[ƒ^ƒXƒo[(&S)" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "ƒ^ƒuƒo[(&B)" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "Œ¾Œê(&L)..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "ƒc[ƒ‹(&T)" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "ƒtƒBƒ‹ƒ^(&F)..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "ƒpƒbƒ`‚̐¶¬(&G)..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "ƒvƒ‰ƒOƒCƒ“(&P)" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "Žè“®“WŠJ" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "Ž©“®“WŠJ" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‚ÅŠJ‚­" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "ƒvƒ‰ƒOƒCƒ“‚̍ēǍž‚Ý(&R)" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "ƒfƒoƒbƒO(&D)" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "ƒRƒ“ƒtƒBƒOƒtƒ@ƒCƒ‹“Ǎž‚Ý(&L)..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "Ý’è‚̃ŠƒZƒbƒg(&R)" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "ƒEƒBƒ“ƒhƒE(&W)" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "•Â‚¶‚é(&O)\tCtrl+W" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "‘S‚ĕ‚¶‚é(&S)" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "ƒyƒCƒ“‚ð•ÏX‚·‚é(&P)\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "ã‰º‚É•À‚ׂĕ\Ž¦(&H)" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "¶‰E‚É•À‚ׂĕ\Ž¦(&V)" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "d‚Ë‚Ä•\Ž¦(&C)" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "ƒwƒ‹ƒv(&H)" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "–ÚŽŸ(&C)...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "õˆø(&I)..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "ŒŸõ(&S)..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "Ý’è(&O)..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "ƒA[ƒJƒCƒuƒTƒ|[ƒg‚ª–³Œø‚Å‚·(&R)..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "GNUˆê”ÊŒöO—˜—p‹–‘øŒ_–ñ‘(&G)..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "WinMerge‚ɂ‚¢‚Ä(&A)..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "ƒvƒƒWƒFƒNƒg‚ðŠJ‚­(&J)...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "¶‘¤‚ð“Ç‚ÝŽæ‚èê—p(&E)" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "‰E‘¤‚ð“Ç‚ÝŽæ‚èê—p(&I)" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "ƒtƒ@ƒCƒ‹ƒGƒ“ƒR[ƒfƒBƒ“ƒO(&E)" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "‚·‚ׂđI‘ð(&A)\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "“¯ˆê€–Ú‚Ì•\Ž¦(&I)" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "·ˆÙ€–Ú‚Ì•\Ž¦(&D)" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "¶‚Ì‚Ý‚É‘¶Ý‚·‚鍀–Ú‚Ì•\Ž¦(&E)" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "‰E‚Ì‚Ý‚É‘¶Ý‚·‚鍀–Ú‚Ì•\Ž¦(&G)" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "ƒXƒLƒbƒv‚³‚ꂽ€–Ú‚Ì•\Ž¦(&K)" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Ì•\Ž¦(&H)" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "”ñ•\Ž¦‚̍€–Ú‚ð•\Ž¦(&E)" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "”äŠr“Œv(&R)" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "ÅV‚̏î•ñ‚ɍXV(S)\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "‘I‘ð€–Ú‚ðÅV‚ɍXV(&R)\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "ƒ}[ƒW(&M)" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "”äŠr(&M)\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "ŽŸ‚̍·ˆÙ(&N)\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "‘O‚̍·ˆÙ(&P)\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Å‰‚̍·ˆÙ(&F)\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Œ»Ý‚̍·ˆÙ(&C)\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "ÅŒã‚̍·ˆÙ(&L)\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "‰E‚ɃRƒs[(&R)\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "¶‚ɃRƒs[(&E)\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "íœ(&D)\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "—ñ‚̐ݒè(&C)..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "ƒŒƒ|[ƒg‚̐¶¬(&R)..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "•Û‘¶(&S)\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "¶‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶(&L)" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "•Û‘¶(&S)" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "–¼‘O‚ð•t‚¯‚Ä•Û‘¶(&A)..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "‰E‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶(&R)" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "ˆóü(&P)..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "ƒy[ƒWÝ’è(&T)" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "ˆóüƒvƒŒƒrƒ…[(&W)" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "‰üsƒR[ƒh‚Ì•ÏŠ·(&F)" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "&DOS (CRLF)" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "&UNIX (LF)" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "&MAC (CR)" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "ƒ}[ƒWƒ‚[ƒh(&M)\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Œ³‚É–ß‚·(&U)\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "‚â‚è’¼‚µ(&R)\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Ø‚èŽæ‚è(&T)\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "ƒRƒs[(&C)\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "“\‚è•t‚¯(&P)\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "s“à‚̍·ˆÙ‚ð‘I‘ð(&D)\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "ŒŸõ(&F)...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "’uŠ·(&E)...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "ƒXƒNƒŠƒvƒg(&S)" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< ‚È‚µ >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "‚“x‚È‘€ì" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "s”ԍ†•t‚«‚ŃRƒs[(&C)\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "ƒuƒbƒNƒ}[ƒN(&B)" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ƒuƒbƒNƒ}[ƒN‚̍쐬Eíœ(&T)\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "ŽŸ‚̃uƒbƒNƒ}[ƒN‚ÖˆÚ“®(&N)\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "‘O‚̃uƒbƒNƒ}[ƒN‚ÖˆÚ“®(&P)\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "‘S‚ẴuƒbƒNƒ}[ƒN‚ðƒNƒŠƒA(&C)" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "ˆÚ“®(&G)...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "ƒVƒ“ƒ^ƒbƒNƒXƒnƒCƒ‰ƒCƒg" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "ƒyƒCƒ“‚ðƒƒbƒN(&L)" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "‹ó”’‚ð•\Ž¦(&V)" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "s“à‚̍·ˆÙ‚ð•\Ž¦(&W)" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "s”ԍ†‚ð•\Ž¦(&N)" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "ƒ}[ƒWƒ“‚ð•\Ž¦(&M)" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "s‚ð‰E’[‚ŐܕԂ·(&R)" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "ƒyƒCƒ“‚ÌŒðŠ·(&A)" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "DiffƒyƒCƒ“(&P)" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "ƒƒP[ƒVƒ‡ƒ“ƒyƒCƒ“(&C)" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "¶‚ɃRƒs[‚µ‚ÄŽŸ‚ɐi‚Þ(&T)\tAlt+Ctrl+Left" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "‰E‚ɃRƒs[‚µ‚ÄŽŸ‚ɐi‚Þ(&O)\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "‘S‚Ä‚ð‰E‚ɃRƒs[(&A)" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "‘S‚Ä‚ð¶‚ÉƒRƒs[(&Y)" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“(&P)" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "”äŠr(&A)" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "¶‚©‚ç‰E‚É(&L)" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "¶‚©‚çŽQÆæ‚Ö(&E)..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "‰E‚©‚獶‚É(&R)" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "‰E‚©‚çŽQÆæ‚Ö(&I)..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "ˆÚ“®(&M)" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "¶‚©‚çŽQÆæ‚Ö(&L)..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "‰E‚©‚çŽQÆæ‚Ö(&R)..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "íœ(&D)" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "¶(&L)" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "‰E(&R)" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "—¼‘¤(&B)" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "–¼‘O‚̕ύX(&N)" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "€–Ú‚ð”ñ•\Ž¦(&H)" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "¶‚ðŠJ‚­(&O)" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "‰E‚ðŠJ‚­(&P)" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "ƒpƒX–¼‚ðƒRƒs[(&Y)" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "¶(&L) (%1 / %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "‰E(&R) (%1 / %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "—¼‘¤(&B) (%1 / %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "ƒtƒ@ƒCƒ‹–¼‚ðƒRƒs[(&F)" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "ˆ³k(&Z)" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "¶(&L)... (%1 / %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "‰E(&R)... (%1 / %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "—¼‘¤(&B)... (%1 / %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "·ˆÙ(&D)... (%1 / %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "‘I‘ð€–Ú‚ðÅVXV(&R)" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "ƒtƒ‹ƒpƒX‚ðƒRƒs[(&C)" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "ƒtƒ@ƒCƒ‹–¼‚ðƒRƒs[(&F)" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“Ý’è" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "Žg—p‚µ‚È‚¢(&N)" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Ž©“®" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "·ˆÙ‚ÖˆÚ“®(&O)" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "ˆÚ“®ƒuƒƒbƒN•\Ž¦‚È‚µ(&N)" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "‘SˆÚ“®ƒuƒƒbƒN•\Ž¦(&A)" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Œ»Ý·ˆÙ‚̈ړ®ƒuƒƒbƒN‚Ì‚Ý•\Ž¦(&C)" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "WinMerge‚ɂ‚¢‚Ä" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "All rights reserved." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMerge‚̃z[ƒ€ƒy[ƒW‚ɍs‚­!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "vŒ£ŽÒ" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "ƒtƒ@ƒCƒ‹‚Ü‚½‚̓tƒHƒ‹ƒ_‚Ì‘I‘ð..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "¶(&L):" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "ŽQÆ(&B)..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "‰E(&R):" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "ŽQÆ(&W)..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "ƒtƒBƒ‹ƒ^(&F):" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "‘I‘ð..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "“WŠJƒvƒ‰ƒOƒCƒ“(&U):" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "‘I‘ð(&S)..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "ƒTƒuƒtƒHƒ‹ƒ_‚ðŠÜ‚Þ(&I)" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "ƒXƒe[ƒ^ƒX:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "ƒLƒƒƒ“ƒZƒ‹" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "ƒwƒ‹ƒv" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "”äŠr‚·‚éƒtƒ@ƒCƒ‹‚Ü‚½‚̓tƒHƒ‹ƒ_" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "ƒf[ƒ^ƒx[ƒX:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "ƒvƒƒWƒFƒNƒg:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "ƒ†[ƒU[:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "ƒpƒXƒ[ƒh:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "‘ΏÛVSSƒvƒƒWƒFƒNƒg‚ƃŠƒ“ƒN‚·‚é" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "‘S‚Ă̍€–Ú‚É“K—p‚·‚é" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "ƒ`ƒFƒbƒNƒAƒEƒg" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "–¼‘O‚ð•t‚¯‚Ä•Û‘¶..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "ƒo[ƒWƒ‡ƒ“ŠÇ—ƒVƒXƒeƒ€" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "ƒo[ƒWƒ‡ƒ“ƒVƒXƒeƒ€(&V):" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe‚ւ̃pƒX(&P):" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "ˆê”Ê" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Ž©“®“I‚ɍŏ‰‚̍·ˆÙ‚ɃXƒNƒ[ƒ‹‚·‚é(&S)" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "ƒXƒvƒ‰ƒbƒVƒ…‰æ–Ê‚ð”ñ•\Ž¦(&D)" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "ESCƒL[‚ŃEƒCƒ“ƒhƒE‚ð•Â‚¶‚é(&O)" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "ŠJ‚­ƒ_ƒCƒAƒƒO‚ÅŽ©“®“I‚ɃpƒX‚ðŒŸ¸‚·‚é" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "•¡”‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ð‹N“®‚µ‚È‚¢(&O)" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "•¡”‚̃EƒCƒ“ƒhƒE‚ð•Â‚¶‚é‚Æ‚«‚ɐq‚Ë‚é(&K)" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "ŠJ‚­ƒ_ƒCƒAƒƒO‚̃I[ƒgƒRƒ“ƒvƒŠ[ƒg(&O):" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "•¡”‚Ì”äŠrƒEƒCƒ“ƒhƒE‚ð—LŒø" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "ƒtƒHƒ‹ƒ_”äŠr(&F)" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "ƒtƒ@ƒCƒ‹”äŠr(&E)" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge ‚́A‚¢‚­‚‚©‚Ì‹¤’ʃƒbƒZ[ƒWƒ{ƒbƒNƒX‚ð”ñ•\Ž¦‚É‚Å‚«‚Ü‚·B ‘S‚ẴƒbƒZ[ƒWƒ{ƒbƒNƒX‚ðÄ‚Ñ•\Ž¦‚³‚¹‚é‚ɂ́AƒŠƒZƒbƒgƒ{ƒ^ƒ“‚ð‰Ÿ‰º‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "ƒŠƒZƒbƒg" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Œ¾Œê" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Žg—p‰Â”\‚ÈŒ¾Œê:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "ŒŸõ" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "ŒŸõ•¶Žš—ñ(&N)" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "’PŒê’PˆÊ‚Å’T‚·(&W)" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "‘啶Žš‚Ə¬•¶Žš‚ð‹æ•Ê‚·‚é(&C)" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "³‹K•\Œ»(&E)" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "ÅŒã‚Ü‚ÅŒŸõ‚µ‚½Œãƒ‹[ƒv‚µ‚È‚¢(&O)" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "ŒŸõ‚·‚é•ûŒü" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "ã‚Ö(&U)" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "‰º‚Ö(&D)" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "ŽŸ‚ðŒŸõ(&F)" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "’uŠ·" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "’uŠ·Œã‚Ì•¶Žš—ñ(&P):" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "ƒtƒ@ƒCƒ‹‚̏I’[‚Ő܂è•Ô‚³‚È‚¢(&D)" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "’uŠ·" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "‘I‘ð”͈Í(&S)" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "ƒtƒ@ƒCƒ‹‘S‘Ì(&O)" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "’uŠ·‚µ‚ÄŽŸ‚É(&R)" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "‚·‚ׂĒuŠ·(&A)" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "ƒ`ƒFƒbƒNƒAƒEƒg" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "ƒRƒƒ“ƒg" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "ƒ`ƒFƒbƒNƒAƒEƒgŒãƒ`ƒFƒbƒNƒCƒ“‚·‚é" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "sƒtƒBƒ‹ƒ^" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "sƒtƒBƒ‹ƒ^‚ð—LŒø‚É‚·‚é" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "³‹K•\Œ» (s‚ ‚½‚èˆê‚Â):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "•Û‘¶(&S)" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "V‹K(&N)" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "•ÒW(&E)" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "íœ(&R)" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "F" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "·ˆÙ‚ ‚è:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "‘I‘ð‚³‚ê‚½·ˆÙ:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "”wŒi" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "íœ" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "ƒeƒLƒXƒg" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "–³Ž‹‚³‚ꂽ·ˆÙ:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "ˆÚ“®ƒuƒƒbƒN:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "‘I‘ð‚³‚ê‚½ˆÚ“®ƒuƒƒbƒN:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "’PŒê‚̍·ˆÙ:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "‘I‘ð‚³‚ê‚½’PŒê‚̍·ˆÙ:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "ƒfƒtƒHƒ‹ƒg" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "ƒ_ƒCƒAƒƒO" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "ƒVƒXƒeƒ€" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "íœ‚³‚ꂽƒtƒ@ƒCƒ‹‚ð‚²‚Ý” ‚Ɉړ®‚·‚é(&P)" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "3•bˆÈ‰º‚ÌŽžŠÔ·‚𖳎‹‚·‚é" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "ƒVƒFƒ‹“‡" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "ƒGƒNƒXƒvƒ[ƒ‰[‚̃Rƒ“ƒeƒLƒXƒgƒƒjƒ…[‚ɒljÁ(&A)" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Šg’£ƒƒjƒ…[‚ð—LŒø‚É‚·‚é(&N)" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "uƒTƒuƒtƒHƒ‹ƒ_‚ðŠÜ‚ށv‚ðƒfƒtƒHƒ‹ƒg‚Æ‚·‚é(&C)" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "ŠO•”ƒGƒfƒBƒ^(&E):" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "ƒtƒBƒ‹ƒ^ƒtƒHƒ‹ƒ_(&F):" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "ŽQÆ..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "ƒpƒbƒ`¶¬" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "ƒtƒ@ƒCƒ‹&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "ƒtƒ@ƒCƒ‹&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "ŽQÆ(&O)..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "ŒðŠ·(&S)" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "Šù‘¶‚̃tƒ@ƒCƒ‹‚ɒljÁ‚·‚é(&A)" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "Œ‹‰Ê(&R):" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "o—ÍŒ`Ž®(&F)" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "ƒXƒ^ƒCƒ‹(&Y):" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "ƒRƒ“ƒeƒLƒXƒg(&C):" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "‹ó”’(&H)" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "”äŠr‚·‚é(&P)" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "•ÏX‚𖳎‹‚·‚é(&G)" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "‚·‚ׂĖ³Ž‹‚·‚é(&N)" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "‹ó”’s‚𖳎‹‚·‚é(&E)" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "‘啶Žš‚Ə¬•¶Žš‚ð‹æ•Ê‚·‚é(&T)" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "ƒRƒ}ƒ“ƒhs‚ðŠÜ‚ß‚é(&D)" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚ÅŠJ‚­(&X)" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "—ñ•\Ž¦" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "ã‚Ö(&U)" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "‰º‚Ö(&D)" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‚Ì‘I‘ð" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "ƒtƒ@ƒCƒ‹“WŠJƒvƒ‰ƒOƒCƒ“:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, 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:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Šg’£Žqˆê——:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "à–¾:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr " ƒtƒHƒ‹ƒ_”äŠrisó‹µ" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "’âŽ~" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "€–Ú‚ð”äŠr‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "”äŠr‚µ‚½€–Ú:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "‘S€–ڐ”:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "ˆÚ“®" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "”ԍ†(&O):" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "ƒtƒ@ƒCƒ‹" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "ˆÚ“®Ží•Ê" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "s(&I)" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "·ˆÙ(&D)" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "ˆÚ“®(&G)" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "”äŠr" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "‹ó”’" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "”äŠr‚·‚é(&C)" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "•ÏX‚𖳎‹‚·‚é(&I)" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "‚·‚ׂĖ³Ž‹‚·‚é(&G)" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "‹ós‚𖳎‹‚·‚é(&K)" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "‘啶Žš‚Ə¬•¶Žš‚ð‹æ•Ê‚µ‚È‚¢(&C)" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "‰üs•¶Žš‚̈Ⴂ‚𖳎‹‚·‚é(&R) (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "ˆÚ“®ƒuƒƒbƒNŒŸo‚ð—LŒø‚É‚·‚é(&N)" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "—ÞŽ—s‚ðƒ}ƒbƒ`‚³‚¹‚é(&M)" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "ƒtƒ@ƒCƒ‹”äŠr•û–@(&F):" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "Å‰‚̍·ˆÙ‚Å”äŠr‚ðI—¹‚·‚é(&T)" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "ƒRƒƒ“ƒg‚̍·ˆÙ‚𖳎‹‚·‚é" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "ƒGƒfƒBƒ^" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "ƒVƒ“ƒ^ƒbƒNƒXƒnƒCƒ‰ƒCƒg(&H)" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Ž©“®“I‚ɍăXƒLƒƒƒ“‚·‚é(&A)" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "Œ³‚ÌEOL•¶Žš‚ð•Û‘¶‚·‚é(&P)" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "ƒ^ƒu" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "ƒ^ƒu•(&T):" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "ƒ^ƒu‚ð‘}“ü(&I)" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "ƒXƒy[ƒX‚ð‘}“ü(&S)" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "s“à·ˆÙ‚̐F•t‚¯" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "s“à·ˆÙ‚ð•\Ž¦‚·‚é" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "•¶Žš’PˆÊ(&C)" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "’PŒê’PˆÊ(&W):" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "ƒtƒ@ƒCƒ‹ƒtƒBƒ‹ƒ^" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "ƒeƒXƒg..." -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "ƒCƒ“ƒXƒg[ƒ‹..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "V‹K..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "•ÒW..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "íœ..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "•ÏX‚³‚ꂽƒtƒ@ƒCƒ‹‚ð•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "¶‘¤ƒtƒ@ƒCƒ‹" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "•ÏX‚ð•Û‘¶‚·‚é(&S)" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "•ÏX‚ð”jŠü‚·‚é(&D)" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "‰E‘¤ƒtƒ@ƒCƒ‹" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "•ÏX‚ð•Û‘¶‚·‚é(&A)" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "•ÏX‚ð”jŠü‚·‚é(&C)" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "‚·‚ׂĔjŠü‚·‚é" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "ƒR[ƒhƒy[ƒW" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "ƒfƒtƒHƒ‹ƒgƒR[ƒhƒy[ƒW" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2005,32 +2012,32 @@ msgstr "" ".html, .rc, .xml ƒtƒ@ƒCƒ‹‚̃R[ƒhƒy[ƒWî•ñ‚ðŒŸo‚·‚é\n" "ƒZƒbƒVƒ‡ƒ“‚̍ċN“®‚ª•K—v‚Å‚·" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "ƒVƒXƒeƒ€ƒR[ƒhƒy[ƒW" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Œ»Ý‚ÌWinMergeƒ†[ƒU[ƒCƒ“ƒ^[ƒtƒF[ƒXŒ¾Œê‚ɏ]‚¤" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "ƒJƒXƒ^ƒ€ƒR[ƒhƒy[ƒW:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - ƒA[ƒJƒCƒuƒTƒ|[ƒg‚ª–³Œø" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "7-Zip‚̃o[ƒWƒ‡ƒ“‚ªŒŸo‚Å‚«‚Ü‚¹‚ñB(ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚È‚¢?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2039,24 +2046,24 @@ msgstr "" "ƒA[ƒJƒCƒuƒTƒ|[ƒg‚ð—LŒø‚É‚·‚é‚É‚Í 7-Zip ‚̃o[ƒWƒ‡ƒ“ 3.11 ˆÈ~‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚é‚©A\n" "ƒXƒ^ƒ“ƒhƒAƒƒ“‘€ì‚Ì‚½‚ß‚É•K—v‚ȃRƒ“ƒ|[ƒlƒ“ƒg‚ðƒvƒƒOƒ‰ƒ€ƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "‚Ü‚½A“KØ‚ȃCƒ“ƒ^[ƒtƒF[ƒXƒvƒ‰ƒOƒCƒ“ (Merge7z*.dll) ‚ªPATHã‚É‘¶Ý‚µ‚Ä‚¢‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñB" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "ÅV‚̃o[ƒWƒ‡ƒ“‚̃Cƒ“ƒ^[ƒtƒF[ƒXƒvƒ‰ƒOƒCƒ“‚ª—˜—p‰Â”\‚É‚È‚é‚܂ŁAˆÈ‰º‚̐„§‚³‚ê‚é7-Zip ‚̃o[ƒWƒ‡ƒ“‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2065,54 +2072,54 @@ msgstr "" "•K—v‚ȃvƒ‰ƒOƒCƒ“\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "7-Zip ‚̐„§ƒo[ƒWƒ‡ƒ“:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "Œ»Ý" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚Ä‚¢‚é 7-Zip:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "‚È‚µ" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "missing" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "½ÀÝÄÞ±Ûݑ€ì‚É•K—v‚È 7-Zip ºÝÎß°ÈÝÄ:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "‹ŒŽ®" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "PATHã‚̃vƒ‰ƒOƒCƒ“:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2121,486 +2128,486 @@ msgstr "" "Ä“x‚±‚̃ƒbƒZ[ƒW‚ð•\Ž¦‚µ‚È‚¢(&M)B\n" "(ƒwƒ‹ƒvƒƒjƒ…[‚©‚炱‚̃ƒbƒZ[ƒW‚ð•\Ž¦‚Å‚«‚Ü‚·B)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Ìß׸޲ÝÀÞ³ÝÛ°ÄÞ" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "ƒIƒvƒVƒ‡ƒ“" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " ƒJƒeƒSƒŠ" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "ƒCƒ“ƒ|[ƒg..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "ƒGƒNƒXƒ|[ƒg..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "ƒL[ƒ[ƒh:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "ŠÖ”–¼:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "ƒRƒƒ“ƒg:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "”’l:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "ƒIƒyƒŒ[ƒ^:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "•¶Žš—ñ:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "ƒvƒŠƒvƒƒZƒbƒT:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "ƒ†[ƒU[1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "ƒ†[ƒU[2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "‘¾Žš" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "ƒtƒHƒ‹ƒ_”äŠrƒŒƒ|[ƒg" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "ƒŒƒ|[ƒgƒtƒ@ƒCƒ‹(&F):" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "ƒXƒ^ƒCƒ‹(&S):" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[(&C)" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "‹¤—L/ƒvƒ‰ƒCƒx[ƒgƒtƒBƒ‹ƒ^" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "‚ǂ̃^ƒCƒv‚̃tƒBƒ‹ƒ^‚ðì¬‚µ‚Ü‚·‚©?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "‹¤—LƒtƒBƒ‹ƒ^ (‚±‚̃}ƒVƒ“ã‚Ì‘S‚Ẵ†[ƒU[‚É—LŒø)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "ƒvƒ‰ƒCƒx[ƒgƒtƒBƒ‹ƒ^ (Œ»Ý‚̃†[ƒU[‚Ì‚Ý)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "ƒA[ƒJƒCƒuƒTƒ|[ƒg" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "ƒA[ƒJƒCƒuƒTƒ|[ƒg‹@”\‚ÌŽg—p‚ɂ́A7-Zip ƒvƒ‰ƒOƒCƒ“‚̃Cƒ“ƒXƒg[ƒ‹‚ª•K—v‚Å‚·:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "7-zip ƒvƒ‰ƒOƒCƒ“ ƒ_ƒEƒ“ƒ[ƒh" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "ƒA[ƒJƒCƒuƒtƒ@ƒCƒ‹ƒTƒ|[ƒg‚ð—LŒø‚É‚·‚é(&E)" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "—˜—p‰Â”\‚Å‚ ‚ê‚΁AƒXƒ^ƒ“ƒhƒAƒƒ“‚Ì7-Zip‚ðŽg—p‚·‚é(&U)" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "WinMergeƒtƒHƒ‹ƒ_‚̃[ƒJƒ‹‚È7-Zip‚ðŽg—p‚·‚é(&S)" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "ƒtƒ@ƒCƒ‹‚̃VƒOƒlƒ`ƒƒ‚©‚çƒA[ƒJƒCƒu‚ÌŽí—Þ‚ðŒŸo‚·‚é(&D)" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "”äŠr“Œv" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "ƒtƒHƒ‹ƒ_:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "ƒtƒ@ƒCƒ‹:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "·ˆÙ" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "ƒeƒLƒXƒg:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "ƒoƒCƒiƒŠ:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "•Ð•û‚Ì‚Ý" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "¶‘¤:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "‰E‘¤:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "“¯ˆê" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "‡Œv:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "•Â‚¶‚é" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "ì—p" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Affects)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "ƒR[ƒhƒy[ƒW‚Ì‘I‘ð" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "ƒtƒ@ƒCƒ‹“Ǎž‚Ý(&F):" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "ƒtƒ@ƒCƒ‹•Û‘¶(&S)" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "—¼‘¤‚É“¯‚¶ƒR[ƒhƒy[ƒW‚ðŽg—p" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "“K—p(&A)" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "ƒLƒƒƒ“ƒZƒ‹(&C)" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "ƒtƒBƒ‹ƒ^‚̃eƒXƒg" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "ƒeƒXƒg‚·‚éƒtƒBƒ‹ƒ^..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "ƒeƒXƒg‚·‚éƒeƒLƒXƒg‚Ì“ü—Í(&E):" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "ƒtƒHƒ‹ƒ_–¼(&F)" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Œ‹‰Ê:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "ƒeƒXƒg(&T)" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "•Â‚¶‚é(&C)" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "ƒJƒXƒ^ƒ€ƒeƒLƒXƒgƒJƒ‰[‚ðŽg—p(&U)" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "ƒJƒXƒ^ƒ€ƒeƒLƒXƒgƒJƒ‰[" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "‹ó”’:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "•W€ƒeƒLƒXƒg:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "‘I‘ð:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "ƒpƒX" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "“Ç‚ÝŽæ‚èê—p(&E)" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "“Ç‚ÝŽæ‚èê—p(&A)" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "ŠJ‚­..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "•Û‘¶..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "ì¬‚·‚éƒoƒbƒNƒAƒbƒv:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹ì¬æ:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "Œ³ƒtƒ@ƒCƒ‹‚̃tƒHƒ‹ƒ_(&O)" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "ƒoƒbƒNƒAƒbƒvƒtƒHƒ‹ƒ_(&G):" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹–¼:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr ".bak Šg’£Žq‚ð’ljÁ‚·‚é" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "ƒ^ƒCƒ€ƒXƒ^ƒ“ƒv‚ð’ljÁ‚·‚é(&P)" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "ƒRƒs[‚ÌŠm”F" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "–{“–‚ɍ€–Ú XXX ‚ðƒRƒs[‚µ‚Ü‚·‚©?" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "¶‚©‚ç" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "‰E‚Ö" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "‚Í‚¢" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "‚¢‚¢‚¦" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041103a4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Japanese translation by sawanaka@d1.dion.ne.jp" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x411, 932" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "ƒŒƒfƒB" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "ã‘" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "‹L˜^" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2609,7 +2616,7 @@ msgstr "" "V‚µ‚¢ƒhƒLƒ…ƒƒ“ƒg‚𐶐¬‚µ‚Ü‚·\n" "V‹KƒhƒLƒ…ƒƒ“ƒg (Ctrl-N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2618,7 +2625,7 @@ msgstr "" "Šù‘¶‚̃hƒLƒ…ƒƒ“ƒg‚ðŠJ‚«‚Ü‚·\n" "ŠJ‚­ (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2627,7 +2634,7 @@ msgstr "" "ì‹Æ’†‚̃hƒLƒ…ƒƒ“ƒg‚ð•Â‚¶‚Ü‚·\n" "•Â‚¶‚é" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2636,7 +2643,7 @@ msgstr "" "ì‹Æ’†‚̃hƒLƒ…ƒƒ“ƒg‚ð•Û‘¶‚µ‚Ü‚·\n" "•Û‘¶ (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2645,7 +2652,7 @@ msgstr "" "ì‹Æ’†‚̃hƒLƒ…ƒƒ“ƒg‚ðV‚µ‚¢–¼‘O‚ð‚‚¯‚Ä•Û‘¶‚µ‚Ü‚·\n" "–¼‘O‚ð•t‚¯‚Ä•Û‘¶" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2654,7 +2661,7 @@ msgstr "" "ˆóüƒIƒvƒVƒ‡ƒ“‚ð•ÏX‚µ‚Ü‚·\n" "ƒy[ƒW ƒŒƒCƒAƒEƒg‚̐ݒè" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2663,7 +2670,7 @@ msgstr "" "ƒvƒŠƒ“ƒ^/ˆóüƒIƒvƒVƒ‡ƒ“‚̕ύX\n" "ˆóüÝ’è" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2672,7 +2679,7 @@ msgstr "" "ì‹Æ’†‚̃hƒLƒ…ƒƒ“ƒg‚ðˆóü‚µ‚Ü‚·\n" "ˆóü" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2681,12 +2688,12 @@ msgstr "" "ˆóüƒCƒ[ƒW‚ð•\Ž¦‚µ‚Ü‚·\n" "ˆóüƒvƒŒƒrƒ…[" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "”ñ•\Ž¦‚É‚µ‚½€–Ú‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2695,32 +2702,32 @@ msgstr "" "ƒvƒƒWƒFƒNƒg‚ðŠJ‚«‚Ü‚·\n" "ƒvƒƒWƒFƒNƒg‚ðŠJ‚­ (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "–¢’m‚̃Gƒ‰[:ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ªŠJ‚¯‚Ü‚¹‚ñ" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "–¢’m‚̃Gƒ‰[:ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ª•Û‘¶‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ª“Ǎž‚Ü‚ê‚Ü‚µ‚½" -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ª•Û‘¶‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2729,7 +2736,7 @@ msgstr "" "Œ»Ý‚̃pƒX‚ƃIƒvƒVƒ‡ƒ“Ý’è‚ðƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·\n" "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚Ì•Û‘¶" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2738,7 +2745,7 @@ msgstr "" "ƒvƒƒOƒ‰ƒ€‚̏î•ñAƒo[ƒWƒ‡ƒ“‚»‚µ‚Ä’˜ìŒ ‚ð•\Ž¦‚µ‚Ü‚·\n" "ƒo[ƒWƒ‡ƒ“î•ñ" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2747,9 +2754,6 @@ msgstr "" "ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ðI—¹‚µAƒtƒ@ƒCƒ‹‚Ì•Û‘¶‚ðŽwŽ¦‚µ‚Ü‚·\n" "I—¹" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2763,11 +2767,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Žw’è‚̃tƒ@ƒCƒ‹‚ðŠJ‚­" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2776,7 +2783,7 @@ msgstr "" "ŽŸ‚̃EƒBƒ“ƒhƒEƒyƒCƒ“‚ɐ؂è‘Ö‚¦‚Ü‚·\n" "ŽŸ‚̃yƒCƒ“" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2785,7 +2792,7 @@ msgstr "" "‘O‚̃EƒBƒ“ƒhƒEƒyƒCƒ“‚ɐ؂è‘Ö‚¦‚Ü‚·\n" "‘O‚̃yƒCƒ“" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2794,7 +2801,7 @@ msgstr "" "ì‹Æ’†‚̃EƒBƒ“ƒhƒE‚ð•¡ŽÊ‚µ‚Ä•\Ž¦‚µ‚Ü‚·\n" "V‹KƒEƒBƒ“ƒhƒE" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2803,7 +2810,7 @@ msgstr "" "ƒEƒBƒ“ƒhƒE‚̉º•”‚ɃAƒCƒRƒ“‚𐮗ñ‚µ‚Ü‚·\n" "ƒAƒCƒRƒ“‚̐®—ñ" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2812,7 +2819,7 @@ msgstr "" "ƒEƒBƒ“ƒhƒE‚ðd‚Ë‚Ä•\Ž¦‚µ‚Ü‚·\n" "d‚Ë‚Ä•\Ž¦" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2821,7 +2828,7 @@ msgstr "" "ƒEƒBƒ“ƒhƒE‚ðã‰º‚É•À‚ׂĕ\Ž¦‚µ‚Ü‚·\n" "ã‰º‚É•À‚ׂĕ\Ž¦" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2830,7 +2837,7 @@ msgstr "" "ƒEƒBƒ“ƒhƒE‚ð¶‰E‚É•À‚ׂĕ\Ž¦‚µ‚Ü‚·\n" "¶‰E‚É•À‚ׂĕ\Ž¦" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2839,7 +2846,7 @@ msgstr "" "ì‹Æ’†‚̃EƒBƒ“ƒhƒE‚𕪊„‚µ‚Ü‚·\n" "•ªŠ„" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2848,7 +2855,7 @@ msgstr "" "‘I‘ð”͈͂ðÁ‹Ž‚µ‚Ü‚·\n" "íœ" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2857,7 +2864,7 @@ msgstr "" "‚·‚ׂďÁ‹Ž‚µ‚Ü‚·\n" "‚·‚ׂč폜" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2866,7 +2873,7 @@ msgstr "" "‘I‘ð”͈͂ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·\n" "ƒRƒs[" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2875,7 +2882,7 @@ msgstr "" "‘I‘ð”͈͂ðØ‚èŽæ‚Á‚āAƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·\n" "Ø‚èŽæ‚è" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2884,7 +2891,7 @@ msgstr "" "Žw’肵‚½•¶Žš—ñ‚ðŒŸõ‚µ‚Ü‚·\n" "ŒŸõ" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2893,7 +2900,7 @@ msgstr "" "ƒNƒŠƒbƒvƒ{[ƒh‚Ì“à—e‚ð‘}“ü‚µ‚Ü‚·\n" "“\‚è•t‚¯" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2902,7 +2909,7 @@ msgstr "" "’¼‘O‚ɍs‚Á‚½“®ì‚ðŒJ‚è•Ô‚·\n" "ŒJ‚è•Ô‚µ" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2911,7 +2918,7 @@ msgstr "" "Žw’肳‚ꂽ•¶Žš—ñ‚ðA‚Ù‚©‚Ì•¶Žš—ñ‚É’u‚«Š·‚¦‚Ü‚·\n" "’uŠ·" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2920,7 +2927,7 @@ msgstr "" "ƒhƒLƒ…ƒƒ“ƒg‘S‘Ì‚ð‘I‘ð‚µ‚Ü‚·\n" "‚·‚ׂđI‘ð" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2929,7 +2936,7 @@ msgstr "" "’¼‘O‚ɍs‚È‚Á‚½‘€ì‚ðŽæ‚èÁ‚µ‚Ü‚·\n" "Œ³‚É–ß‚· (Ctrl+Z)" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2938,7 +2945,7 @@ msgstr "" "’¼‘O‚ɍs‚Á‚½“®ì‚ðŒJ‚è•Ô‚·\n" "ŒJ‚è•Ô‚· (Ctrl+Y)" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2947,7 +2954,7 @@ msgstr "" "ƒc[ƒ‹ƒo[‚Ì•\Ž¦/”ñ•\Ž¦‚ðØ‚è‘Ö‚¦‚Ü‚·\n" "ƒc[ƒ‹ƒo[•\Ž¦‚̃gƒOƒ‹" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2956,7 +2963,7 @@ msgstr "" "ƒXƒe[ƒ^ƒXƒo[‚Ì•\Ž¦/”ñ•\Ž¦‚ðØ‚è‘Ö‚¦‚Ü‚·\n" "ƒXƒe[ƒ^ƒXƒo[•\Ž¦‚̃gƒOƒ‹" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2965,7 +2972,7 @@ msgstr "" "ƒ^ƒuƒo[‚Ì•\Ž¦/”ñ•\Ž¦‚ðØ‚è‘Ö‚¦‚Ü‚·\n" "ƒ^ƒuƒo[•\Ž¦‚̃gƒOƒ‹" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "" "Automatically resize panes\n" @@ -2974,57 +2981,57 @@ msgstr "" "Ž©“®“I‚ɃyƒCƒ“‚ðƒŠƒTƒCƒY‚µ‚Ü‚·\n" "ƒyƒCƒ“‚̃ƒbƒN" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "ƒEƒBƒ“ƒhƒE‚̃TƒCƒY‚ð•ÏX" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "ƒEƒBƒ“ƒhƒE‚̈ʒu‚ð•ÏX" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "ƒEƒBƒ“ƒhƒE‚ðÅ¬‰»‚·‚é" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "ƒEƒBƒ“ƒhƒE‚ðÅ‘剻‚·‚é" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "ŽŸ‚̃EƒBƒ“ƒhƒE‚ɐ؂è‘Ö‚¦‚é" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "‘O‚̃EƒBƒ“ƒhƒE‚ɐ؂è‘Ö‚¦‚é" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "ì‹Æ’†‚̃EƒBƒ“ƒhƒE‚ð•Â‚¶A•ÏX‚µ‚½ƒtƒ@ƒCƒ‹‚Ì•Û‘¶‚ðŽwŽ¦" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "ƒEƒBƒ“ƒhƒE‚ð’ʏí‚̃TƒCƒY‚É–ß‚·" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̐؂è‘Ö‚¦" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Žw’è‚̃EƒBƒ“ƒhƒE‚ð•\Ž¦" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3033,7 +3040,7 @@ msgstr "" "ˆóüƒvƒŒƒrƒ…[ƒ‚[ƒh‚ðI—¹‚µ‚Ü‚·\n" "ƒvƒŒƒrƒ…[‚̃Lƒƒƒ“ƒZƒ‹" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3052,23 +3059,23 @@ msgstr "" "WinMerge.Document\n" "WinMerge Document" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Œ³‚ÌEOL•¶Žš‚ð•ÛŽ‚µ‚Ü‚·" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "‰½‚©ƒL[‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "‰EƒNƒŠƒbƒN‚ŃpƒX‚ðƒRƒs[" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3077,152 +3084,152 @@ msgstr "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 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 Public License in the Help menu for details." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "’†Ž~(&A)" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "ÄŽŽs(&R)" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "–³Ž‹(&I)" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "‘S‚Ä–³Ž‹(&A)" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "‚Í‚¢(&Y)" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "‘S‚Ä‚Í‚¢(&A)" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "‚¢‚¢‚¦(&N)" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "‘S‚Ä‚¢‚¢‚¦(&L)" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "‘±s(&C)" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "ƒXƒLƒbƒv(&S)" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "‚·‚ׂăXƒLƒbƒv(&A)" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Ä‚Ñ‚±‚̃ƒbƒZ[ƒW‚ð•\Ž¦‚µ‚È‚¢(&M)" -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Ä‚Ñ‚±‚ÌŽ¿–â‚ð‚µ‚È‚¢(&Q)" -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "ƒVƒ“ƒ^ƒbƒNƒXƒJƒ‰[" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "ƒeƒLƒXƒgƒJƒ‰[" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "ƒo[ƒWƒ‡ƒ“ŠÇ—" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "To:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "¶‚©‚ç:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "¶‚Ö:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "‰E‚©‚ç:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "‰E‚Ö:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Version %1 - Japanese" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "ƒIƒvƒVƒ‡ƒ“ (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "‚·‚ׂẴƒbƒZ[ƒWƒ{ƒbƒNƒX‚ªAÄ‚Ñ•\Ž¦‚³‚ê‚Ü‚·B" -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Œ»ÝŠJ‚¢‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚͕ύX‚³‚ê‚Ä‚¢‚Ü‚·B‚¢‚­‚‚©‚̐ݒè‚́AŒ»Ý‚̃tƒ@ƒCƒ‹‚ð”äŠr‚µ‚È‚¨‚·‚Ü‚Å”½‰f‚³‚ê‚È‚¢‚©‚à‚µ‚ê‚Ü‚¹‚ñB" -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "‘I‘ð‚³‚ê‚½ƒtƒHƒ“ƒg‚ÍŒ»Ý•\Ž¦‚³‚ê‚Ä‚¢‚鍷ˆÙƒEƒCƒ“ƒhƒE‚É‚Í“K—p‚³‚ê‚Ü‚¹‚ñB" -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3233,7 +3240,7 @@ msgstr "" "\n" "1‚©‚ç%1‚Ü‚Å‚Ì’l‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3244,107 +3251,107 @@ msgstr "" "\n" "ƒŠƒZƒbƒgŒã‚ÍWinMerge‚ðÄ‹N“®‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "ŠJ‚­" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ƒvƒƒOƒ‰ƒ€|*.exe;*.bat;*.cmd|‚·‚ׂẴtƒ@ƒCƒ‹(*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "‚·‚ׂẴtƒ@ƒCƒ‹ (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ý’èƒtƒ@ƒCƒ‹ (*.ini)|*.ini|‚·‚ׂẴtƒ@ƒCƒ‹(*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -#: Merge.rc:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ƒtƒ@ƒCƒ‹ (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ƒtƒ@ƒCƒ‹ (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "ƒtƒ‹ƒRƒ“ƒeƒ“ƒc" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "ƒNƒCƒbƒNƒRƒ“ƒeƒ“ƒc" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "XV“úŽž" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "XV“úŽž‚ƃTƒCƒY" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "ƒTƒCƒY" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "–¼Ì" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "êŠ" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "ƒtƒBƒ‹ƒ^" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "à–¾" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "V‚µ‚¢ƒtƒBƒ‹ƒ^‚̃tƒ@ƒCƒ‹–¼‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "ƒtƒ@ƒCƒ‹ƒtƒBƒ‹ƒ^ (*.flt)|*.flt|All Files (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3357,7 +3364,7 @@ msgstr "" "ƒtƒ@ƒCƒ‹ %1 ‚ðˆÈ‰º‚Ì WinMerge/Filters ƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ä‚­‚¾‚³‚¢:\n" "%2" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3369,7 +3376,7 @@ msgstr "" "\n" "ƒtƒHƒ‹ƒ_‚Ì‘¶Ý‚Ü‚½‚͏‘‚«ž‚݉”\‚Å‚ ‚é‚©Šm”F‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3380,7 +3387,7 @@ msgstr "" "\n" "[ƒIƒvƒVƒ‡ƒ“/ƒVƒXƒeƒ€]‚ŃtƒBƒ‹ƒ^ƒtƒHƒ‹ƒ_‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3392,12 +3399,12 @@ msgstr "" "\n" "‚»‚̃tƒ@ƒCƒ‹‚Í“Ç‚ÝŽæ‚èê—p‚Å‚Í‚ ‚è‚Ü‚¹‚ñ‚©?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒtƒBƒ‹ƒ^ƒtƒ@ƒCƒ‹‚̈ʒu" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3408,208 +3415,208 @@ msgstr "" "\n" "V‚µ‚¢ƒtƒBƒ‹ƒ^ƒtƒ@ƒCƒ‹‚ðƒtƒBƒ‹ƒ^ƒtƒHƒ‹ƒ_‚ɃRƒs[‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "ƒtƒBƒ‹ƒ^ƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B‘¶Ý‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "³‹K•\Œ»" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "cleartool.exe‚ւ̃pƒX(&P) :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "SS.EXE‚ւ̃pƒX(&P) :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "ƒtƒHƒ‹ƒ_”äŠrŒ‹‰Ê" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "ƒtƒ@ƒCƒ‹”äŠr" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "¶–³‘è" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "‰E–³‘è" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "ƒtƒ@ƒCƒ‹‚ðƒXƒLƒƒƒ“‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ðŠJ‚¢‚Ä‚¢‚Ü‚·" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "¶‚©‚ç‰E‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "‰E‚©‚獶‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "‘S‚Ä‚ð¶‚ÉƒRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "‘S‚Ä‚ð‰E‚ɃRƒs[‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "ƒtƒ@ƒCƒ‹‚ðƒRƒs[‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "ƒtƒ@ƒCƒ‹‚ðíœ‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "ƒtƒ@ƒCƒ‹‚ðˆÚ“®‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "ƒŒƒ|[ƒg‚𐶐¬‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "s: %s —ñ: %d/%d •¶Žš: %d/%d EOL: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "s: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "s: %s —ñ: %d/%d •¶Žš: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "ƒ}[ƒW" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "·ˆÙ %1/%2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "€–Ú %1/%2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "€–Ú: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "‘¶Ý‚·‚éƒtƒHƒ‹ƒ_‚Ü‚½‚́Aƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Folder Selection" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "2‚‚̃tƒHƒ‹ƒ_‚Ü‚½‚́A2‚‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "¶‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "‰E‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "—¼‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‘I‘ð‚ð—LŒø‚É‚·‚é‚ɂ̓tƒ@ƒCƒ‹‚ð“ñ‚‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "ƒtƒ@ƒCƒ‹‚ƃtƒHƒ‹ƒ_‚Í”äŠr‚Å‚«‚Ü‚¹‚ñ!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "ƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "ƒtƒ@ƒCƒ‹‚ª“WŠJ‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3622,7 +3629,7 @@ msgstr "" "\n" "‚́A“¯ˆê‚ȃoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Å‚·B" -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3635,7 +3642,7 @@ msgstr "" "\n" "‚́A·ˆÙ‚Ì‚ ‚éƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Å‚·B" -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3646,7 +3653,7 @@ msgstr "" "\n" "‚́AƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Å‚·BƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚ƃeƒLƒXƒgƒtƒ@ƒCƒ‹‚ð”äŠr‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3659,39 +3666,39 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "–¼‘O‚ð•t‚¯‚Ä•Û‘¶" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "" "ƒtƒ@ƒCƒ‹ %1 ‚Ì“à—e‚͕ύX‚³‚ê‚Ä‚¢‚Ü‚·B\n" "•ÏX‚ð•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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‚Í“Ç‚ÝŽæ‚èê—pƒtƒ@ƒCƒ‹‚Å‚·B “Ç‚ÝŽæ‚èê—pƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚©? (V‚µ‚¢ƒtƒ@ƒCƒ‹–¼‚Å‚Í•Û‘¶‚µ‚Ü‚¹‚ñB)" -#: Merge.rc:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "ƒtƒ@ƒCƒ‹‘‚«ž‚݉ƒ`ƒFƒbƒNƒGƒ‰[" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "ƒtƒ@ƒCƒ‹ƒoƒbƒNƒAƒbƒvƒGƒ‰[" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3704,7 +3711,7 @@ msgstr "" "‚ðƒoƒbƒNƒAƒbƒv‚Å‚«‚Ü‚¹‚ñB\n" "–³Ž‹‚µ‚Ä‘±‚¯‚Ü‚·‚©?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3720,7 +3727,7 @@ msgstr "" "•Ê–¼‚Å•Û‘¶‚·‚éê‡‚ÍOk‚ðA\n" "’†Ž~‚·‚éê‡‚́AƒLƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3735,7 +3742,7 @@ msgstr "" "\n" "“WŠJ‚³‚ꂽ‚à‚Ì‚ð•Êƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3750,7 +3757,7 @@ msgstr "" "\n" "“WŠJ‚³‚ꂽ‚à‚Ì‚ð•Êƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3762,7 +3769,7 @@ msgstr "" "%1\n" "‚±‚̃tƒ@ƒCƒ‹‚Í WinMerge ˆÈŠO‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ŏC³‚³‚ê‚Ä‚¢‚Ü‚·BC³‚³‚ꂽƒtƒ@ƒCƒ‹‚ɏ㏑‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3771,7 +3778,7 @@ msgstr "" "%1\n" "‚́A“Ç‚ÝŽæ‚èê—p‚Å‚·B “Ç‚ÝŽæ‚èê—p‚̍€–Ú‚ðã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3786,17 +3793,17 @@ msgstr "" "\n" "ƒtƒ@ƒCƒ‹‚ðXV‚µ‚½‚¢ê‡‚́Aƒtƒ@ƒCƒ‹‚ðŠJ‚«’¼‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "–¼‘O‚ð•t‚¯‚趑¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "–¼‘O‚ð•t‚¯‚ĉE‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3807,42 +3814,42 @@ msgstr "" "\n" "‘±s‚·‚é‘O‚ɃhƒLƒ…ƒƒ“ƒg‚ðF5ƒL[‚ōŐV‚É‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "‘±s‚·‚邽‚߂ɂ́ASourceSafeƒvƒƒWƒFƒNƒgƒpƒX‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B (—á: $/MyProject)" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "VSS‚©‚çƒtƒ@ƒCƒ‹‚ðƒ`ƒFƒbƒNƒAƒEƒg‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "ƒo[ƒWƒ‡ƒ“ƒVƒXƒeƒ€ƒRƒ}ƒ“ƒh‚ÌŽÀsƒGƒ‰[B" -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "VSS‚̃f[ƒ^ƒx[ƒX‚ª‚݂‚©‚è‚Ü‚¹‚ñ!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "VSS‚©‚ç‚̃Gƒ‰[:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3853,7 +3860,7 @@ msgstr "" " Žg—p‚µ‚Ä‚¢‚éƒrƒ…[‚̐ݒè‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B\n" " ƒ`ƒFƒbƒNƒAƒEƒg‚ðƒLƒƒƒ“ƒZƒ‹‚µ‚Ü‚·‚©?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3862,179 +3869,179 @@ msgstr "" "ƒo[ƒWƒ‡ƒ“ŠÇ—ƒVƒXƒeƒ€‚́Aƒtƒ@ƒCƒ‹‚̃`ƒFƒbƒNƒAƒEƒgƒLƒƒƒ“ƒZƒ‹Žž‚ɃGƒ‰[‚ð•Ô‚µ‚Ü‚µ‚½B\n" " Žg—p‚µ‚Ä‚¢‚éƒrƒ…[‚̐ݒè‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B " -#: Merge.rc:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "‚È‚µ" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 –¢–ž)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ˆÈã)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "‹ó”’‚Å‹æØ‚é" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "‹ó”’‚©‹å“Ç“_‚Å‹æØ‚é" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "‘I‘ð‚³‚ê‚½€–Ú‚ðŽw’èƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "‘I‘ð‚³‚ê‚½€–Ú‚ð‘I‘ð‚³‚ê‚½ƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "¶‚Ì‘I‘ð‚³‚ê‚½€–Ú‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "‰E‚Ì‘I‘ð‚³‚ê‚½€–Ú‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "—¼‘¤‚Ì‘I‘ð‚³‚ê‚½€–Ú‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "‘I‘ð‚³‚ê‚½€–Ú‚ð”ñ•\Ž¦‚É‚µ‚Ü‚·(ƒIƒ“ƒUƒtƒ‰ƒC ƒtƒBƒ‹ƒ^)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "—¼‘¤‚Ì‘I‘ð‚³‚ê‚½€–Ú‚Ì–¼‘O‚ð•ÏX‚µ‚Ü‚·" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "‰E‚©‚獶 (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "¶‚©‚ç‰E (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "‰E‚ð¶‚É (%1 / %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¶‚ð‰E‚É (%1 / %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "¶‚ð... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "‰E‚ð... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "¶‚ð... (%1/%2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "‰E‚ð... (%1/%2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "¶ (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "‰E (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "—¼‘¤ (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "¶ (%1 / %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "‰E (%1 / %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "—¼‘¤ (%1 / %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "‘ΏۃtƒHƒ‹ƒ_‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "¶‘¤ - ƒRƒs[/ˆÚ“®æƒtƒHƒ‹ƒ_‚ÌŽw’è:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "‰E‘¤ - ƒRƒs[/ˆÚ“®æƒtƒHƒ‹ƒ_‚ÌŽw’è:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ŒÂ‚̃tƒ@ƒCƒ‹‚ɍì—p)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1/%2 ŒÂ‚̃tƒ@ƒCƒ‹‚ɍì—p)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "–{“–‚É‘S‚Ă̍·ˆÙ‚ð¶‘¤‚̃tƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·‚©?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "–{“–‚É‘S‚Ă̍·ˆÙ‚ð‰E‘¤‚̃tƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·‚©?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4050,17 +4057,17 @@ msgstr "" "%2\n" "‚ɃRƒs[‚µ‚Ü‚·‚©?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "–{“–‚É‘I‘ð‚³‚ê‚½ %2ŒÂ‚̍€–Ú‚Ì“à %1ŒÂ‚ðƒRƒs[‚µ‚Ü‚·‚©?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "–{“–‚É‘I‘ð‚³‚ê‚½%2ŒÂ‚̍€–Ú‚Ì“à %1ŒÂ‚ðíœ‚µ‚Ü‚·‚©?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4072,7 +4079,7 @@ msgstr "" "%1\n" "‚ðíœ‚µ‚Ü‚·‚©?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4084,17 +4091,17 @@ msgstr "" "%1\n" "‚ðíœ‚µ‚Ü‚·‚©?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "–{“–‚ɃRƒs[‚µ‚Ü‚·‚©?:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "–{“–‚É%d€–Ú‚ðƒRƒs[‚µ‚Ü‚·‚©?:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4113,458 +4120,458 @@ msgstr "" "\n" "Ä“x”äŠr‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "¶‚̃tƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚ō¶‚̃tƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "¶‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚½ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ÅŠJ‚«‚Ü‚·..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "‰E‚̃tƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚ʼnE‚̃tƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "‰E‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚½ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ÅŠJ‚«‚Ü‚·..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "ŠO•”ƒGƒfƒBƒ^‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "ŠO•”ƒGƒfƒBƒ^‚ÌŠg’£Žq‚ª–¢’m‚ÌŠg’£Žq‚Å‚·: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚Ƀtƒ@ƒCƒ‹–¼‚ðƒRƒs[‚µ‚Ü‚·" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "¶‘¤‚̃pƒX–¼‚ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "‰E‘¤‚̃pƒX–¼‚ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "—¼‘¤‚̃pƒX–¼‚ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[‚µ‚Ü‚·" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "–¢’m‚̃A[ƒJƒCƒuŒ`Ž®‚Å‚·" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "ƒA[ƒJƒCƒu‚ɍ¶‘¤‚̍€–Ú‚ð’ljÁ‚µ‚Ü‚·" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "ƒA[ƒJƒCƒu‚ɉE‘¤‚̍€–Ú‚ð’ljÁ‚µ‚Ü‚·" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "ƒA[ƒJƒCƒu‚É—¼‘¤‚̍€–Ú‚ð’ljÁ‚µ‚Ü‚·" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "ƒA[ƒJƒCƒu‚ɍ·ˆÙ‚Ì‚ ‚é—¼‘¤‚̍€–Ú‚ð’ljÁ‚µ‚Ü‚·" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "¶‘¤‚Ì‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ðŽw’肵‚½ƒtƒHƒ‹ƒ_‚Ɉړ®‚µ‚Ü‚·" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "‰E‘¤‚Ì‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ðŽw’肵‚½ƒtƒHƒ‹ƒ_‚Ɉړ®‚µ‚Ü‚·" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "ƒtƒ@ƒCƒ‹–¼" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "ƒtƒHƒ‹ƒ_" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "”äŠrŒ‹‰Ê" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "¶“ú•t" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "‰E“ú•t" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Šg’£Žq" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "¶ƒTƒCƒY" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "‰EƒTƒCƒY" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "‰EƒTƒCƒY (’Zk)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "¶ƒTƒCƒY (’Zk)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "¶ì¬“úŽž" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "‰Eì¬“úŽž" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "V‚µ‚¢ƒtƒ@ƒCƒ‹" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "¶ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "‰Eƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "ŠÈˆÕŒ‹‰Ê•\Ž¦" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "¶‘®«" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "‰E‘®«" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "¶EOL" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "‰EEOL" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "¶ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "‰EƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "–³Ž‹‚³‚ꂽ·ˆÙ”" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "·ˆÙ”" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "ƒoƒCƒiƒŠ" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "ƒtƒ@ƒCƒ‹‚ð”äŠr‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "’†’f‚³‚ꂽ€–Ú" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "ƒXƒLƒbƒv‚³‚ꂽƒtƒ@ƒCƒ‹" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "ƒXƒLƒbƒv‚³‚ꂽƒtƒHƒ‹ƒ_" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "¶‘¤‚Ì‚Ý: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "‰E‘¤‚Ì‚Ý: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "ƒtƒ@ƒCƒ‹‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "¶‘¤‚Ì‚Ý" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "‰E‘¤‚Ì‚Ý" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "ƒGƒ‰[" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Œo‰ßŽžŠÔ: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1ŒÂ‚̍€–Ú‚ð‘I‘ð" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1ŒÂ‚̍€–Ú‚ð‘I‘ð" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "ƒtƒ@ƒCƒ‹–¼‚Ü‚½‚́AƒtƒHƒ‹ƒ_–¼" -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "ƒTƒuƒtƒHƒ‹ƒ_‚ªŠÜ‚܂ꂽ‚Æ‚«‚̃TƒuƒtƒHƒ‹ƒ_–¼" -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "’·‚¢Œ`Ž®‚Ì”äŠrŒ‹‰Ê•\Ž¦" -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "¶‘¤‚̍XV“ú•t" -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "‰E‘¤‚̍XV“ú•t" -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "ƒtƒ@ƒCƒ‹Šg’£Žq" -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "¶‘¤‚̍쐬Žž" -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "‰E‘¤‚̍쐬Žž" -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "‚Ç‚¿‚炪ÅV‚̕ύX“ú•t‚©‚ðŽ¦‚µ‚Ü‚·B" -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "’Z‚¢Œ`Ž®‚Ì”äŠrŒ‹‰Ê•\Ž¦" -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "¶‘¤‚Ì‘®«" -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "‰E‘¤‚Ì‘®«" -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "¶‘¤‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "‰E‘¤‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "¶‘¤ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "‰E‘¤ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ƒtƒ@ƒCƒ‹“à‚Å–³Ž‹‚³‚ꂽ·ˆÙ”B‚±‚̍·ˆÙ‚ÍWinMerge‚É‚æ‚Á‚Ä–³Ž‹‚³‚êAƒ}[ƒW‚³‚ê‚Ü‚¹‚ñB" -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ƒtƒ@ƒCƒ‹“à·ˆÙ”B‚±‚̍·ˆÙ”‚Í–³Ž‹‚³‚ꂽ·ˆÙ”‚ðŠÜ‚Ý‚Ü‚¹‚ñB" -#: Merge.rc:2317 +#: Merge.rc:2320 #, 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:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "%1 ‚Æ %2 ‚Ì”äŠr" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "CSVŒ`Ž®" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "TAB‹æØ‚èŒ`Ž®" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "ƒVƒ“ƒvƒ‹HTMLŒ`Ž®" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "ƒVƒ“ƒvƒ‹XMLŒ`Ž®" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "ƒŒƒ|[ƒgƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ä‚¢‚Ü‚·B‘¶Ý‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚ª?" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4573,47 +4580,47 @@ msgstr "" "ƒŒƒ|[ƒg¶¬ƒGƒ‰[:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "ƒŒƒ|[ƒg¶¬‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "“¯‚¶ƒtƒ@ƒCƒ‹‚ª—¼‘¤‚̃pƒlƒ‹‚ÅŠJ‚©‚ê‚Ä‚¢‚Ü‚·B" -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·B" -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚́A—¼‘¤‚̃tƒHƒ‹ƒ_‚É‘¶Ý‚µ‚È‚¢‚½‚߁AŠJ‚¯‚Ü‚¹‚ñB" -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "ƒtƒ@ƒCƒ‹‚Ì”äŠrŽž‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B" -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚ÍŽ‹Šo“I‚É”äŠr‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "ƒeƒ“ƒ|ƒ‰ƒŠƒtƒ@ƒCƒ‹‚ªì¬‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½Bƒeƒ“ƒ|ƒ‰ƒŠƒpƒXÝ’è‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "ƒtƒHƒ‹ƒ_‚́AƒrƒWƒ…ƒAƒ‹‚É”äŠr‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4630,7 +4637,7 @@ msgstr "" "[•ÒW]¨[Ý’è]¨[”äŠr]‚Ì'‰üs•¶Žš‚̈Ⴂ‚𖳎‹‚·‚é'ƒIƒvƒVƒ‡ƒ“‚ð\n" "ƒZƒbƒg‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4641,22 +4648,22 @@ msgstr "" " Œ»Ý‚̃IƒvƒVƒ‡ƒ“Ý’è‚ł́AŽå‚ÈEOL‚É“ˆê‚³‚ê‚Ü‚·B\n" " ƒIƒvƒVƒ‡ƒ“‚ð•ÏX‚µ‚āAˆÙ‚È‚éEOL‚ð•ÛŽ‚·‚é‚悤‚É‚µ‚Ü‚·‚©?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "ƒvƒ‰ƒOƒCƒ“'%2'‚Ńtƒ@ƒCƒ‹'%1'‚Ì”äŠr‘Oˆ—‚ÌŽÀs’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B”äŠr‘Oˆ—‚͈ȍ~s‚È‚í‚ê‚Ü‚¹‚ñB" -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "‘I‘ð‚³‚ê‚½ƒtƒHƒ‹ƒ_‚Í–³Œø‚Å‚·B" -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚ðƒGƒfƒBƒ^‚ÅŠJ‚­‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4667,132 +4674,132 @@ msgstr "" "ŠeX‚̃tƒ@ƒCƒ‹‚ð‚»‚ÌƒR[ƒhƒy[ƒW‚Å•\Ž¦‚·‚ê‚΁A³‚µ‚­•\Ž¦‚³‚ê‚Ü‚·‚ªAƒ}[ƒW‚âƒRƒs[‚ªŠëŒ¯‚É‚È‚è‚Ü‚·B\n" "ƒR[ƒhƒy[ƒW‚ðƒfƒtƒHƒ‹ƒgƒR[ƒhƒy[ƒW‚Æ‚µ‚Ĉµ‚¢‚Ü‚·‚ªA‚æ‚낵‚¢‚Å‚·‚©(„§)?" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Œx: ŒÝ‚¢‚ɈقȂÁ‚½ƒGƒ“ƒR[ƒfƒBƒ“ƒO‚̃tƒ@ƒCƒ‹‚Å‚·B ¶‘¤=%s ‰E‘¤=%s ƒ}[ƒW‚·‚éê‡Aî•ñ‚ªŽ¸‚í‚ê‚é‚©‚à‚µ‚ê‚Ü‚¹‚ñB" -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(—¼‘¤‚̃tƒ@ƒCƒ‹)" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(‰E‘¤‚̃tƒ@ƒCƒ‹)" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(¶‘¤‚̃tƒ@ƒCƒ‹)" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "·ˆÙ‚Í‚ ‚è‚Ü‚¹‚ñ" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "s‚̍·ˆÙ" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "%1ŒÂ‚Ì•¶Žš—ñ‚ð’uŠ·‚µ‚Ü‚µ‚½" -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "•¶Žš—ñ\"%s\"‚ªŒŸõ‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "ƒtƒ‹ƒpƒX‚ðƒRƒs[‚µ‚Ü‚·" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "ƒtƒ@ƒCƒ‹–¼‚ðƒRƒs[‚µ‚Ü‚·" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "ƒƒP[ƒVƒ‡ƒ“ƒyƒCƒ“" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "DiffƒyƒCƒ“" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "ƒpƒbƒ`ƒtƒ@ƒCƒ‹‘ž‚݂ɐ¬Œ÷‚µ‚Ü‚µ‚½B" -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. €–Ú‚ª‚݂‚©‚ç‚È‚¢‚©AƒtƒHƒ‹ƒ_‚Å‚·!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. €–Ú‚ª‚݂‚©‚ç‚È‚¢‚©AƒtƒHƒ‹ƒ_‚Å‚·!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "o—ÍŒ‹‰Êƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B ã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 ŒÂ‚̃tƒ@ƒCƒ‹‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚·]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "ƒm[ƒ}ƒ‹" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "ƒRƒ“ƒeƒLƒXƒg" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "ƒ†ƒjƒtƒ@ƒCƒh" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "ƒtƒ@ƒCƒ‹ %1‚ɏ‘‚«ž‚ß‚Ü‚¹‚ñB" -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Žw’肵‚½o—̓pƒX‚́Aâ‘΃pƒX‚Å‚Í‚ ‚è‚Ü‚¹‚ñ: %1" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "o—̓pƒX‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚©‚çƒpƒbƒ`ƒtƒ@ƒCƒ‹‚͐¶¬‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "ƒtƒHƒ‹ƒ_‚©‚çƒpƒbƒ`ƒtƒ@ƒCƒ‹‚͐¶¬‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4803,17 +4810,17 @@ msgstr "" "\n" "ƒpƒbƒ`¶¬‚ɂ́A•ÏX‚ª‘S‚Ä•Û‘¶‚³‚ê‚Ä‚¢‚é•K—v‚ª‚ ‚è‚Ü‚·B" -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "ƒtƒHƒ‹ƒ_‚Í‘¶Ý‚µ‚Ü‚¹‚ñB" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Œ»Ý‚̃tƒHƒ‹ƒ_”äŠrŒ‹‰Ê‚̓NƒŠƒA‚³‚ê‚Ü‚·B" -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4824,7 +4831,7 @@ msgstr "" "ƒA[ƒJƒCƒuƒTƒ|[ƒg‚ׂ̈ɕK—v‚ȃRƒ“ƒ|[ƒlƒ“ƒg(7-zip ‚Æ Merge7z*.dll) ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB\n" "ƒA[ƒJƒCƒuƒTƒ|[ƒg‚Æ‚»‚ê‚ð—LŒø‚É‚·‚é•û–@‚ɂ‚¢‚Ă̏î•ñ‚́Aƒ}ƒjƒ…ƒAƒ‹‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4833,7 +4840,7 @@ msgstr "" "\n" "’ˆÓ: 7-Zip “‡‚́AWinMerge‚̐ݒè‚É‚æ‚è–³Œø‚É‚È‚Á‚Ä‚¢‚Ü‚·B" -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4842,37 +4849,37 @@ msgstr "" "\n" "’ˆÓ: 7-Zip “‡‚́AWinMerge‚̐ݒè‚É‚æ‚èƒXƒ^ƒ“ƒhƒAƒƒ“‘€ì‚ɐ§ŒÀ‚³‚ê‚Ä‚¢‚Ü‚·B" -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "ƒGƒNƒXƒ|[ƒg‚·‚éƒtƒ@ƒCƒ‹‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "ƒCƒ“ƒ|[ƒg‚·‚éƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Ý’èî•ñ‚ªƒtƒ@ƒCƒ‹‚©‚çƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Ý’èî•ñ‚ðƒtƒ@ƒCƒ‹‚ɃGƒNƒXƒ|[ƒg‚µ‚Ü‚µ‚½B" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "ƒtƒ@ƒCƒ‹‚©‚çÝ’èî•ñ‚̃Cƒ“ƒ|[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "ƒtƒ@ƒCƒ‹‚ւ̐ݒèî•ñ‚̏‘‚«ž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4883,1098 +4890,1098 @@ msgstr "" "\n" "‘±s‚µ‚Ü‚·‚©?" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "³‹K•\Œ»ƒGƒ‰[" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "ƒ}ƒbƒ`‚µ‚Ü‚¹‚ñ" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "–³Œø‚Ȑ³‹K•\Œ»‚Å‚·" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "–³Œø‚ȏƍ‡•¶Žš‚Å‚·" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "–³Œø‚ȃLƒƒƒ‰ƒNƒ^ƒNƒ‰ƒX–¼‚Å‚·" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "\\ ‚ŏI‚í‚Á‚Ä‚¢‚Ü‚·" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "–³Œø‚ÈŒã•ûŽQÆ‰‰ŽZŽq‚Å‚·" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "[ ‚© [^ ‚̑Ήž‚ª‚Æ‚ê‚Ä‚¢‚Ü‚¹‚ñ" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "( ‚© \\( ‚̑Ήž‚ª‚Æ‚ê‚Ä‚¢‚Ü‚¹‚ñ" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "\\{ ‚̑Ήž‚ª‚Æ‚ê‚Ä‚¢‚Ü‚¹‚ñ" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\} ‚Ì“à—e‚ª–³Œø‚Å‚·" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "–³Œø‚Ȕ͈͂̏I—¹ˆÊ’u‚Å‚·" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "ƒƒ‚ƒŠ‚ª•s‘«‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "ŒJ‚è•Ô‚µ‰‰ŽZŽq‚ª–³Œø‚Ȉʒu‚É‚ ‚è‚Ü‚·" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "³‹K•\Œ»‚ªˆÙí‚Å‚·" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "³‹K•\Œ»‚ª‘å‚«‚·‚¬‚Ü‚·" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr ") ‚© \\) ‚̑Ήž‚ª‚Æ‚ê‚Ä‚¢‚Ü‚¹‚ñ" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Afrikaans" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanian" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabic (Saudi Arabian)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabic (Iraq)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabic (Egyptian)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabic (Libyan)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabic (Algerian)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabic (Moroccan)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabic (Tunisian)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabic (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabic (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabic (Syrian)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabic (Jordan)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabic (Lebanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabic (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabic (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabic (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabic (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armenian" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azeri (Latin)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azeri (Cyrillic)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Basque" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Belarusian" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgarian" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalan" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chinese (Traditional)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chinese (Simplified)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chinese (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chinese (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chinese (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Croatian" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Czech" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Dansk" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Dutch" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Dutch (Belgium)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "English (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "English (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "English (Australian)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "English (Canadian)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "English (New Zealand)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "English (Irish)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "English (So. African)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "English (Jamaican)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "English (Caribbean)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "English (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "English (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "English (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "English (Philippines)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Eesti" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Faeroese" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Farsi" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Suomi" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "French" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "French (Belgique)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "French (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "French (Switzerland)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "French (Luxembourg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "French (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgian" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "German (Germany)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "German (Switzerland)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "German (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "German (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "German (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Greek" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebrew" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Hindi" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Hungarian" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Icelandic" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesian" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italian" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italian (Swiss)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japanese" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmiri (India)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Kazakh" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Korean" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Korean (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Latvian" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lithuanian" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malay (Malaysian)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malay (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "Manipuri" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norwegian (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norwegian (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polski" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugese" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugese (Brazil)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Romanian" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russian" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sanskrit" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbian (Latin)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbian (Cyrillic)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "Sindhi" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Slovak" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Slovenian" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Spanish" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Spanish (Mexican)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Spanish (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Spanish (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Spanish (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Spanish (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Spanish (Dominican)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Spanish (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Spanish (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Spanish (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Spanish (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Spanish (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Spanish (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Spanish (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Spanish (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Spanish (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Spanish (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Spanish (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Spanish (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Spanish (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Kenya)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Swedish" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Swedish (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tamil" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatar (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Thai" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turkish" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ukranian" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "Urdu (Pakistan)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (India)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbek (Latin)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbek (Cyrillic)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamese" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Western European" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Eastern European" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "East Asian" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Middle Eastern" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Not applicable" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Approximates ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Approximates ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Approximates ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Approximates ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Approximates ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "¶‚̃tƒ@ƒCƒ‹‚ð•Û‘¶‚µ‚Ü‚·" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "‰E‚̃tƒ@ƒCƒ‹‚ð•Û‘¶‚µ‚Ü‚·" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "¶‚̃tƒ@ƒCƒ‹‚𖼑O‚ð•t‚¯‚Ä•Û‘¶‚µ‚Ü‚·..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "‰E‚̃tƒ@ƒCƒ‹‚𖼑O‚ð•t‚¯‚Ä•Û‘¶‚µ‚Ü‚·..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "¶‚̃tƒ@ƒCƒ‹/ƒtƒHƒ‹ƒ_‚ðƒŠ[ƒhƒIƒ“ƒŠ[ó‘ԂɕύX‚µ‚Ü‚·" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "‰E‚̃tƒ@ƒCƒ‹/ƒtƒHƒ‹ƒ_‚ðƒŠ[ƒhƒIƒ“ƒŠ[ó‘ԂɕύX‚µ‚Ü‚·" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "EOL‚ðDOSƒ^ƒCƒv‚É•ÏŠ·‚µ‚Ü‚·" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "EOL‚ðUnixƒ^ƒCƒv‚É•ÏŠ·‚µ‚Ü‚·" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "EOL‚ðMACƒ^ƒCƒv‚É•ÏŠ·‚µ‚Ü‚·" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Œ»Ý‚̃‚[ƒh‚©‚ç•ÒWƒ‚[ƒh‚Ü‚½‚̓}[ƒWƒ‚[ƒh‚ðØ‚è‘Ö‚¦‚Ü‚·" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5983,12 +5990,12 @@ msgstr "" "ƒtƒ@ƒCƒ‹ƒGƒ“ƒR[ƒfƒBƒ“ƒOî•ñ‚Ì•\Ž¦‚Ɛݒè‚ðs‚¢‚Ü‚·B\n" "ƒtƒ@ƒCƒ‹ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒvƒƒpƒeƒB" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5997,7 +6004,7 @@ msgstr "" "Œ»Ýs‚̍·ˆÙ•”•ª‚ð‘I‘ð‚µ‚Ü‚·\n" "Œ»Ý‚̍s“à·ˆÙ" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6006,7 +6013,7 @@ msgstr "" "Žw’肵‚½s‚Ü‚½‚́A·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ˆÚ“®(Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6015,7 +6022,7 @@ msgstr "" "ƒvƒƒOƒ‰ƒ€ƒIƒvƒVƒ‡ƒ“‚ðÝ’肵‚Ü‚·\n" "ƒIƒvƒVƒ‡ƒ“" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6024,37 +6031,37 @@ msgstr "" "ÅV‚̏î•ñ‚ɍXV‚µ‚Ü‚·\n" "•\Ž¦XV (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "‘I‘ð‚³‚ê‚½s‚̐擪‚ɍs”ԍ†‚ð•t‰Á‚µ‚ăNƒŠƒbƒvƒ{[ƒh‚ÖƒRƒs[‚µ‚Ü‚·" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "‘I‘ð‚³‚ê‚½€–ڂ̏î•ñ‚ðÅV‚É‚µ‚Ü‚·" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "ƒuƒbƒNƒ}[ƒN‚̍쐬Eíœ‚ðs‚¢‚Ü‚·" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "ŽŸ‚̃uƒbƒNƒ}[ƒN‚Ɉړ®‚µ‚Ü‚·" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "‘O‚̃uƒbƒNƒ}[ƒN‚Ɉړ®‚µ‚Ü‚·" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "‘S‚ẴuƒbƒNƒ}[ƒN‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6063,7 +6070,7 @@ msgstr "" "³Šm‚Ɉê’v‚µ‚Ä‚¢‚鍀–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "“¯ˆê€–Ú‚Ì•\Ž¦" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6072,7 +6079,7 @@ msgstr "" "·ˆÙ‚Ì‚ ‚鍀–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "·ˆÙ€–Ú‚Ì•\Ž¦" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6081,7 +6088,7 @@ msgstr "" "‰E‘¤‚É‚Ì‚Ý‘¶Ý‚·‚鍀–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "¶‚Ì‚Ý‚É‘¶Ý‚·‚鍀–Ú‚Ì•\Ž¦" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6090,7 +6097,7 @@ msgstr "" "‰E‘¤‚É‚Ì‚Ý‘¶Ý‚·‚鍀–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "‰E‚Ì‚Ý‚É‘¶Ý‚·‚鍀–Ú‚Ì•\Ž¦" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6099,7 +6106,7 @@ msgstr "" "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚ð•\Ž¦‚µ‚Ü‚·\n" "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Ì•\Ž¦" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6108,7 +6115,7 @@ msgstr "" "ƒXƒLƒbƒv‚³‚ꂽ€–Ú‚ð•\Ž¦‚µ‚Ü‚·\n" "ƒXƒLƒbƒv‚³‚ꂽ€–Ú‚Ì•\Ž¦" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6117,7 +6124,7 @@ msgstr "" "•\Ž¦‚Ì‚½‚߂̃tƒHƒ“ƒg‚ð‘I‘ð‚µ‚Ü‚·\n" "•\Ž¦ƒtƒHƒ“ƒg‘I‘ð" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6126,27 +6133,27 @@ msgstr "" "•\Ž¦ƒtƒHƒ“ƒg‚ðƒfƒtƒHƒ‹ƒgƒVƒXƒeƒ€ƒtƒHƒ“ƒg‚É–ß‚µ‚Ü‚·\n" "ƒfƒtƒHƒ‹ƒgƒtƒHƒ“ƒg" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "‹ó”’•¶Žš‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "DiffƒyƒCƒ“‚Ì•\Ž¦/”ñ•\Ž¦‚ðØ‚è‘Ö‚¦‚Ü‚·" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "ƒƒP[ƒVƒ‡ƒ“ƒyƒCƒ“‚̓tƒ@ƒCƒ‹‚Ì“à—e‘S‘Ì‚ðƒsƒNƒ`ƒƒ‚Æ‚µ‚Ä•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "ƒtƒHƒ‹ƒ_”äŠr“Œvƒ_ƒCƒAƒƒO‚ð•\Ž¦‚µ‚Ü‚·B" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6155,7 +6162,7 @@ msgstr "" "Œ»Ý‚̃†[ƒU[ƒCƒ“ƒ^[ƒtƒF[ƒXŒ¾Œê‚ð‘I‘ð‚µ‚Ü‚·\n" "Œ¾Œê" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6164,12 +6171,12 @@ msgstr "" "s“à‚̍·ˆÙ‚ðF‚ð•Ï‚¦‚Ä•\Ž¦‚µ‚Ü‚·\n" "s“à‚̍·ˆÙ‚ð•\Ž¦" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "2‚‚̃yƒCƒ“‚̈ʒu‚ðŒðŠ·‚µ‚Ü‚·" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6178,7 +6185,7 @@ msgstr "" "s”ԍ†‚ð•\Ž¦‚µ‚Ü‚·\n" "s”ԍ†‚ð•\Ž¦" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6187,7 +6194,7 @@ msgstr "" "s‚ð‰E’[‚Ő܂è•Ô‚µ‚Ü‚·B\n" "s‚ð‰E’[‚ŐܕԂ·" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6196,17 +6203,17 @@ msgstr "" "—¼‘¤‚̃yƒCƒ“‚ɃZƒŒƒNƒVƒ‡ƒ“ƒ}[ƒWƒ“‚ð•\Ž¦‚µ‚Ü‚·B\n" "ƒZƒŒƒNƒVƒ‡ƒ“ƒ}[ƒWƒ“‚Ì•\Ž¦" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6215,7 +6222,7 @@ msgstr "" "‘O‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "‘O‚̍·ˆÙ (Alt+Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6224,7 +6231,7 @@ msgstr "" "ŽŸ‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·\n" "ŽŸ‚̍·ˆÙ (Alt+Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6233,7 +6240,7 @@ msgstr "" "Å‰‚̍·ˆÙ‚Ɉړ®‚µ‚Ü‚·\n" "Å‰‚̍·ˆÙ (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6242,7 +6249,7 @@ msgstr "" "Œ»Ý‚̍·ˆÙ‚Ɉړ®‚µ‚Ü‚·\n" "Œ»Ý‚̍·ˆÙ (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6251,7 +6258,7 @@ msgstr "" "ÅŒã‚̍·ˆÙ‚Ɉړ®‚µ‚Ü‚·\n" "ÅŒã‚̍·ˆÙ (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6260,7 +6267,7 @@ msgstr "" "‘I‘ð‚³‚ê‚½ƒeƒLƒXƒg‚ð‰E‚̃tƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·\n" "‰E‚ÖƒRƒs[ (Alt+Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6269,7 +6276,7 @@ msgstr "" "‘I‘ð‚³‚ê‚½ƒeƒLƒXƒg‚ð¶‚Ìƒtƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·\n" "¶‚ÖƒRƒs[ (Alt+Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6278,7 +6285,7 @@ msgstr "" "·ˆÙ‚ð‰E‚ɃRƒs[‚µAŽŸ‚̍·ˆÙ‚ɐi‚Ý‚Ü‚·\n" "‰E‚ɃRƒs[‚µŽŸ‚Ö (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6287,7 +6294,7 @@ msgstr "" "·ˆÙ‚ð¶‚ÉƒRƒs[‚µAŽŸ‚̍·ˆÙ‚ɐi‚Ý‚Ü‚·\n" "¶‚ɃRƒs[‚µŽŸ‚Ö (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6296,7 +6303,7 @@ msgstr "" "‚·‚ׂĂ̍·ˆÙ‚ð‰E‚̃tƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·\n" "‰E‚·‚ׂÄ" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6305,72 +6312,72 @@ msgstr "" "‚·‚ׂĂ̍·ˆÙ‚ð¶‚Ìƒtƒ@ƒCƒ‹‚ɃRƒs[‚µ‚Ü‚·\n" "¶‚·‚ׂÄ" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "—¼‘¤‚̃tƒHƒ‹ƒ_‚©‚ç‘I‘ð‚³‚ê‚½€–Ú‚ðíœ‚µ‚Ü‚·" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "‘I‘ð‚³‚ê‚½€–Ú‚ð”äŠr‚µ‚Ü‚· (•¡”‚̍€–Ú‚ª‘I‘ð‚³‚ê‚Ä‚¢‚½ê‡AÅ‰‚̍€–Ú‚ð”äŠr‚µ‚Ü‚·)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "ƒtƒHƒ‹ƒ_”äŠr•\Ž¦‚Ì—ñ‚ð‘I‘ð‚Ü‚½‚Í•À‚בւ¦‚Ü‚·" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "ƒpƒbƒ`ƒtƒ@ƒCƒ‹¶¬‚µ‚Ü‚·" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "ƒtƒBƒ‹ƒ^‚Ì‘I‘ð‚ƕύX‚ð‚µ‚Ü‚·" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "”äŠrŒ‹‰Ê‚©‚烌ƒ|[ƒg‚𐶐¬‚µ‚Ü‚·" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‚ðƒ†[ƒU[‚ª‘I‘ð‚µ‚Ü‚· (ƒtƒHƒ‹ƒ_”äŠr‚Ì‚Æ‚«‚Í“WŠJ‚µ‚Ü‚¹‚ñ)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Ž©“®“I‚É“WŠJƒvƒ‰ƒOƒCƒ“‚ð‘I‘ð‚µA—¼‘¤‚̃tƒ@ƒCƒ‹‚É“K—p‚µ‚Ü‚· (‚Ç‚¿‚ç‚©‚̃tƒ@ƒCƒ‹‚ɂ́AŠg’£Žq‚ª•K—v‚Å‚·)" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "‚±‚̃tƒ@ƒCƒ‹‚ð•ÒW‚·‚邽‚ß‚Ì“WŠJƒvƒ‰ƒOƒCƒ“‚ð‘I‘ð‚µ‚Ü‚·" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“‚ðŽg—p‚µ‚È‚¢ (•W€)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "ŠÖ˜A‚·‚éƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "‚»‚Ì‘¼‚̃vƒ‰ƒOƒCƒ“" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "‘S‚Ẵvƒ‰ƒOƒCƒ“‚ðÄ“Ǎž‚Ý‚µ‚Ü‚· (ŠJ”­ŽÒ—p)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6379,12 +6386,12 @@ msgstr "" "ŽŸ‚̃tƒ@ƒCƒ‹‚ðƒAƒNƒeƒBƒu‚É‚µ‚Ü‚·\n" "ŽŸ‚̃tƒ@ƒCƒ‹‚ð‘I‘ð" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "ŠJ‚¢‚Ä‚¢‚é‘S‚ẴEƒCƒ“ƒhƒE‚ð•Â‚¶‚Ü‚·" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6393,22 +6400,22 @@ msgstr "" "WinMergeƒ†[ƒU[ƒKƒCƒh‚ð•\Ž¦‚µ‚Ü‚·\n" "ƒwƒ‹ƒv" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Œ»Ý‚Ì WinMerge ‚̃o[ƒWƒ‡ƒ“î•ñ‚Ɛݒè‚ðƒeƒLƒXƒgƒtƒ@ƒCƒ‹‚ɏo—Í‚µ‚Ü‚·" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "GNUˆê”ÊŒöO—˜—p‹–‘øŒ_–ñ‘‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6417,7 +6424,7 @@ msgstr "" "WinMerge‚̃wƒ‹ƒvõˆø‚ð•\Ž¦‚µ‚Ü‚·\n" "ƒwƒ‹ƒvõˆø" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6426,267 +6433,272 @@ msgstr "" "WinMerge‚̃wƒ‹ƒvŒŸõ‚ð•\Ž¦‚µ‚Ü‚·\n" "ƒwƒ‹ƒvŒŸõ" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "ƒvƒ‰ƒOƒCƒ“Ý’è" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“‚ðŽg—p‚µ‚Ü‚¹‚ñ" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "‰Â”\‚È‚ç‚ΔäŠr‘Oˆ—‚ðs‚È‚¢‚Ü‚·" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ‚ª‚݂‚©‚è‚Ü‚¹‚ñ - .sct ƒXƒNƒŠƒvƒg‚Í–³Œø‰»‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "<‚È‚µ>" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "<Ž©“®>" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "“o˜^‚³‚ꂽƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚Ńtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚Ńtƒ@ƒCƒ‹‚ðŠJ‚«‚Ü‚·" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "“Á’è‚̃vƒƒOƒ‰ƒ€‚ÅŠJ‚«‚Ü‚·" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "ˆÚ“®ƒuƒƒbƒN‚ð•\Ž¦‚µ‚Ü‚¹‚ñ" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "‘S‚Ă̈ړ®ƒuƒƒbƒN‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Œ»Ý‚̍·ˆÙ‚ɑΉž‚·‚éˆÚ“®ƒuƒƒbƒN‚Ì‚Ý‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "ƒJ[ƒ\ƒ‹’¼‰º‚̍·ˆÙ‚ÖˆÚ“®‚µ‚Ü‚·" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "·ˆÙ%1/%2‚Ɉړ®(&O)" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "s%1‚Ɉړ®(&O)" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "–³Œø" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Å‹ßŽg‚Á‚½ƒŠƒXƒg" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "ƒc[ƒ‹ƒo[‚ð”ñ•\Ž¦‚É‚µ‚Ü‚·" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "¬‚³‚¢ƒAƒCƒRƒ“‚̃c[ƒ‹ƒo[‚ð•\Ž¦‚µ‚Ü‚·" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "‘å‚«‚¢ƒAƒCƒRƒ“‚̃c[ƒ‹ƒo[‚ð•\Ž¦‚µ‚Ü‚·" diff --git a/Src/Languages/Korean.po b/Src/Languages/Korean.po index aae798be5..77294eac1 100644 --- a/Src/Languages/Korean.po +++ b/Src/Languages/Korean.po @@ -72,7 +72,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "º¹»ç(&C)" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "ºÙ¿©³Ö±â(&P)" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "À̵¿(&G)" @@ -95,43 +95,43 @@ msgid "Op&en" msgstr "¿­±â(&E)" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "¿¬°á ÇÁ·Î±×·¥(&R)" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "¿ÜºÎ ÆíÁý±â(&E)" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "ÇÁ·Î±×·¥ ¼±ÅÃ(&W)..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "ÆÄÀÏ(&F)" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "»õ·Î ¸¸µé±â(&N)\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "¿­±â(&O)...\tCtrl+O" @@ -147,8 +147,8 @@ msgid "Open Project...\tCtrl+J" msgstr "ÇÁ·ÎÁ§Æ® ¿­±â...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "ÇÁ·ÎÁ§Æ® ÀúÀå(&V)..." @@ -159,1845 +159,1852 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "³¡³»±â(&X)" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "ÆíÁý(&E)" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "¿É¼Ç(&O)..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "º¸±â(&V)" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "ÆùÆ® ¼±ÅÃ(&F)..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "±âº» ÆùÆ® »ç¿ë(&O)" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "»óÅ ǥ½ÃÁÙ(&S)" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "¾ð¾î(&L)..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "µµ±¸(&T)" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "ÇÊÅÍ(&F)" #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "ÆÐÄ¡ »ý¼º(&G)" #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "Ç÷¯±×ÀÎ(&P)" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "¼öµ¿ Unpacking(&M)" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "ÀÚµ¿ Unpacking(&A)" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "Unpacker »ç¿ë ÆíÁý(&E)" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "Ç÷¯±×ÀÎ ´Ù½Ã ·Îµå(&R)" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "â(&W)" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "´Ý±â(&O)" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "¸ðµÎ ´Ý±â(&S)" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "â(pane) Àüȯ(&P)\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "¼öÁ÷ Á¤·Ä(&H)" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "¼öÆò Á¤·Ä(&V)" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "°è´Ü½Ä Á¤·Ä(&C)" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "µµ¿ò¸»(&H)" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "¸ñÂ÷(&C)...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "»öÀÎ(&I)..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "°Ë»ö(&S)..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "¼³Á¤(&O)..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "¾ÐÃàÆÄÀÏ Áö¿ø(&R)" -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "" -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "WinMerge Á¤º¸(&A)..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "ÇÁ·ÎÁ§Æ® ¿­±â...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "¿ÞÂÊÀ» ÀбâÀü¿ëÀ¸·Î(E&)" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "¿À¸¥ÂÊÀ» ÀбâÀü¿ëÀ¸·Î(&G)" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "ÆÄÀÏ ÀÎÄÚµù(&C)" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Àüü¼±ÅÃ(&A)\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "µ¿ÀÏ ÆÄÀÏ º¸±â(&I)" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "´Ù¸¥ ÆÄÀÏ º¸±â(&D)" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸±â(&E)" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸±â(&G)" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "ÇÊÅ͸µµÈ ÆÄÀÏ º¸±â(&H)" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "¹ÙÀ̳ʸ® ÆÄÀÏ º¸±â(&H)" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "°¨ÃçµÐ ÆÄÀÏ º¸±â(&E)" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "»õ·Î °íħ(&S)\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "Merge(&M)" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "ºñ±³(&M)\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "´ÙÀ½ ´Ù¸¥ ºÎºÐ(&N)\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "ÀÌÀü ´Ù¸¥ ºÎºÐ(&P)\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "óÀ½ ´Ù¸¥ ºÎºÐ(&F)\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "ÇöÀç ¼±ÅÃµÈ ´Ù¸¥ ºÎºÐ(&C)\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "¸¶Áö¸· ´Ù¸¥ ºÎºÐ(&L)\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "¿À¸¥ÂÊÀ¸·Î º¹»ç(&R)\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "¿ÞÂÊÀ¸·Î º¹»ç(&E)\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "»èÁ¦(&D)\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "µð·ºÅ丮 ºñ±³ ¼³Á¤(&Customize Columns)" -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "¸®Æ÷Æ® »ý¼º(&R)..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "ÀúÀå(&S)\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "¿ÞÂÊ ÀúÀå(&L)" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "ÀúÀå(&S)" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå(&A)..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "¿À¸¥ÂÊ ÀúÀå(&R)" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "Àμâ(&P)..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "¹Ì¸®º¸±â(&R)" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "EOL º¯È¯(&C)" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Merge ¸ðµå\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "½ÇÇàÃë¼Ò(&U)\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Àç½ÇÇà(&R)\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "À߶󳻱â(&T)\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "º¹»ç(&C)\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "ºÙ¿©³Ö±â(&P)\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "ã±â(&I)...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "¹Ù²Ù±â(&C)...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "½ºÅ©¸³Æ®(&S)" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< ºñ¾îÀÖÀ½ >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "°í±Þ" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Çà¹øÈ£ Æ÷ÇÔ º¹»ç(&C)\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "ºÏ¸¶Å©(&B)" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ºÏ¸¶Å© Åä±Û(&T)\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "´ÙÀ½ ºÏ¸¶Å©(&N)\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "ÀÌÀü ºÏ¸¶Å©(&P)\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "¸ðµç ºÏ¸¶Å© »èÁ¦(&C)" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "À̵¿(&G)...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "°ø¹é º¸±â(&V)" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Line Difference º¸±â(&W)" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Çà¹øÈ£ º¸±â(&N)" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "ÀÚµ¿ ÁٹٲÞ(&R)" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "â(pane) À§Ä¡ ¹Ù²Ù±â(&A)" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "¼±Åà ºñ±³Ã¢ º¸±â(&P)" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "À§Ä¡ Ç¥½Ãâ(&C)" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "¿À¸¥ÂÊÀ¸·Î º¹»çÈÄ ´ÙÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿(&O)\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "¿ÞÂÊÀ¸·Î º¹»çÈÄ ´ÙÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿(&T)\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î º¹»ç(&A)" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "¸ðµÎ ¿ÞÂÊÀ¸·Î º¹»ç(&E)" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "ºñ±³(&A)" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "¿ÞÂÊ¿¡¼­ ¿À¸¥ÂÊÀ¸·Î(&L)" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "¿ÞÂÊ º¹»ç À§Ä¡ ÁöÁ¤(&E)" -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "¿À¸¥ÂÊ¿¡¼­ ¿ÞÂÊÀ¸·Î(&R)" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "¿À¸¥ÂÊ º¹»ç À§Ä¡ ÁöÁ¤(&I)" -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "À̵¿(&M)" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "¿ÞÂÊ À̵¿ À§Ä¡ ÁöÁ¤(&L)" -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "¿À¸¥ÂÊ À̵¿ À§Ä¡ ÁöÁ¤(&R)" -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "»èÁ¦(&D)" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "¿ÞÂʸ¸(&L)" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "¿À¸¥Âʸ¸(&R)" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "¸ðµÎ(&B)" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "À̸§ ¹Ù²Ù±â(&N)" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "°¨Ãß±â(&H)" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "¿ÞÂÊ ÆÄÀÏ ¿­±â(&O)" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¿­±â(&O)" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "°æ·Î º¹»ç(&Y)" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "¿ÞÂʸ¸(&L) (%1 of %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "¿À¸¥Âʸ¸(&R) (%1 of %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "¸ðµÎ(&B) (%1 of %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "ÆÄÀÏÀ̸§ º¹»ç(&F)" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "¾ÐÃà(&Zip)" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "¿ÞÂʸ¸(&L)... (%1 of %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "¿À¸¥Âʸ¸(&R)... (%1 of %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "¸ðµÎ(&B)... (%1 of %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "´Ù¸¥ ÆÄÀϸ¸(&D)... (%1 of %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "»õ·Î°íħ(&R)" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "Àüü°æ·Î º¹»ç(&C)" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "ÆÄÀÏÀ̸§ º¹»ç(&F)" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Prediffer ¼³Á¤" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "prediffer »ç¿ë¾ÈÇÔ(&N)" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "prediffer ÀÚµ¿¼±ÅÃ" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "´Ù¸¥ºÎºÐÀ¸·Î À̵¿(&O)" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "À̵¿¿µ¿ª Ç¥½ÃÇÏÁö ¾ÊÀ½(&N)" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "¸ðµç À̵¿¿µ¿ª Ç¥½Ã(&A)" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "ÇöÀç ¼±ÅÃµÈ À̵¿¿µ¿ª¸¸ Ç¥½Ã(&C)" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "WinMerge Á¤º¸" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "" -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMerge ȨÆäÀÌÁö¿¡ µé·Áº¸¼¼¿ä!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "È®ÀÎ" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "¿ÞÂÊ(&L):" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "ã¾Æº¸±â(&B)" -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "¿À¸¥ÂÊ(&R):" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "ã¾Æº¸±â(&W)" -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "ÇÊÅÍ(&F):" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "¼±ÅÃ..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "¼±ÅÃ(&S)..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "ÇÏÀ§ µð·ºÅ丮 Æ÷ÇÔ(&I)" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "»óÅÂ:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Ãë¼Ò" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "µµ¿ò¸»" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "VSS project ¿¡ ¿¬°á" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "¸ðµç Ç׸ñ¿¡ Àû¿ë" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "´Ù¸¥À̸§À¸·Î ÀúÀå..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Çü»ó °ü¸® ½Ã½ºÅÛ" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "Çü»ó °ü¸® ½Ã½ºÅÛ(&V) :" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe °æ·Î(&P) :" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "ÀϹÝ" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "óÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î ÀÚµ¿ ½ºÅ©·Ñ(&S)" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "½ºÇ÷¡½¬ È­¸é »ç¿ë ¾ÈÇÔ(&D)" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "ESC·Î ⠴ݱâ(&O)" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "¿­±â ´ëÈ­»óÀÚ¿¡¼­ ÀÚµ¿À¸·Î ¿Ã¹Ù¸¥ °æ·ÎÀÎÁö °Ë»ç" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "Winmerge ½Ì±Û ÀνºÅϽº¸¸ Çã¿ëÇÔ(&A)" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "¿­±â ´ëÈ­»óÀÚ ÀÚµ¿¿Ï¼º ±â´É(&P):" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "´ÙÁß À©µµ¿ì ±â´É Àû¿ë" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "µð·ºÅ丮 ºñ±³(&F)" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "ÆÄÀÏ ºñ±³(&E)" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "¸î¸î °æ°í ¸Þ¼¼Áö´Â º¸ÀÌÁö ¾Ê°Ô ÇÒ ¼ö ÀÖ½À´Ï´Ù. ÃʱâÈ­ Çϸé ÇØ´ç ¸Þ¼¼Áö´Â ´Ù½Ã ³ªÅ¸³³´Ï´Ù" -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "ÃʱâÈ­" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "¾ð¾î" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "¼±Åà °¡´ÉÇÑ ¾ð¾î:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "ã±â" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "ãÀ» ³»¿ë(&N) :" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "´Ü¾î ´ÜÀ§·Î(&W)" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "´ë¼Ò¹®ÀÚ ±¸ºÐ(&C)" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "Á¤±Ô Ç¥Çö½Ä(&E)" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "EOF·¦(Wrap End of File) ÇÏÁö ¾Ê±â(&O)" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "¹æÇâ" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "À§·Î(&U)" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "¾Æ·¡·Î(&D)" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "´ÙÀ½ ã±â(&F)" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "¹Ù²Ù±â" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "¹Ù²Ü ³»¿ë(&P):" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "EOF·¦(Wrap End of File) ÇÏÁö ¾Ê±â" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Àû¿ë ¹üÀ§" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "ÇöÀç ÆÄÀÏ(&S)" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "¸ðµç ÆÄÀÏ(&O)" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "¹Ù²Ù±â(&R)" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "¸ðµÎ ¹Ù²Ù±â(&A)" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "üũ¾Æ¿ô" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "ÄÚ¸àÆ®" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "checkout ÈÄ¿¡ checkin" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "¶óÀÎ ÇÊÅÍ" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Á¤±Ô Ç¥Çö½Ä (¸Å1¶óÀθ¶´Ù Àû¿ë):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "»ö»ó" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "´Ù¸¥ ºÎºÐ:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "¼±ÅÃµÈ ´Ù¸¥ ºÎºÐ:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "¹è°æ»ö" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "»èÁ¦¿µ¿ª" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "ÅؽºÆ®" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "¹«½ÃµÈ ´Ù¸¥ ºÎºÐ:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "À̵¿ÇÑ ºÎºÐ:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "¼±ÅÃµÈ À̵¿ÇÑ ºÎºÐ:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "´Ü¾î´ÜÀ§ ´Ù¸¥ ºÎºÐ:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "¼±ÅÃµÈ ´Ü¾î´ÜÀ§ ´Ù¸¥ ºÎºÐ:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "±âº»°ª" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "´ëÈ­ »óÀÚ" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "½Ã½ºÅÛ" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "»èÁ¦ÇÑ ÆÄÀÏÀº ÈÞÁöÅëÀ¸·Î(&P)" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "3ÃÊ À̳» ½Ã°£ Â÷ÀÌ´Â ¹«½ÃÇϱâ(&O)" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "Ž»ö±â Æ˾÷ ¸Þ´º¿¡ Ãß°¡(&A)" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "°í±Þ ¸Þ´º È°¼ºÈ­(&N)" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "ÇÏÀ§ µð·ºÅ丮 Æ÷ÇÔÀ» ±âº»À¸·Î »ç¿ë(&C)" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "¿ÜºÎ ÆíÁý±â(&E):" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "µð·ºÅ丮 ÇÊÅ͸µ(&F):" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "ã¾Æº¸±â..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "ÆÐÄ¡ »ý¼º±â" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "ÆÄÀÏ&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "ÆÄÀÏ&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "ã¾Æº¸±â(&O)" -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "À§Ä¡¹Ù²Ù±â(&S)" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "Á¸ÀçÇÏ´Â ÆÄÀÏ¿¡ µ¡ºÙÀ̱â(&A)" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "°á°ú(&R):" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "Çü½Ä(&F)" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "½ºÅ¸ÀÏ(&Y):" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "°ø¹é¹®ÀÚ(whitespace)" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "¸ðµÎ ºñ±³(&P)" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "¹Ù²ïºÎºÐ ºñ±³ ¾ÈÇÔ(&G)" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "¸ðµÎ ºñ±³ ¾ÈÇÔ(&N)" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "°ø¹é ¶óÀÎ ¹«½Ã(&E)" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "´ë¼Ò¹®ÀÚ ±¸ºÐ(&T)" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Ä¿¸Çµå ¶óÀο¡¼­ ½ÇÇà½Ã¿¡µµ Àû¿ë(&D)" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "¿ÜºÎ ÆíÁý±â·Î ¿­±â(&X)" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "µð·ºÅ丮 ºñ±³ Ç¥½Ã Ç׸ñ" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "ÆÄÀÏ unpacker:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "¸ðµç unpacker Ç¥½Ã, È®ÀåÀÚ¸¦ üũÇÏÁö ¾ÊÀ½" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "È®ÀåÀÚ ¸ñ·Ï:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "¼³¸í:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "µð·ºÅ丮 ºñ±³ »óȲ" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "ÁßÁö" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "ºñ±³ ÁøÇàÁß..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "ºñ±³ ¿Ï·áµÈ ÆÄÀÏ :" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "¸ðµç ÆÄÀÏ :" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "À̵¿" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "À̵¿(&O):" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "ÆÄÀÏ" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "À̵¿ÇÒ °÷" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "¶óÀÎ(&N)" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "´Ù¸¥ ºÎºÐ(&D)" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "À̵¿(&G)" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "ºñ±³" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "°ø¹é" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "°ø¹é ºñ±³(&W)" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "¹Ù²ï °ø¹é ¹«½Ã(&H)" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "¸ðµç °ø¹é ¹«½Ã(&A)" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "°ø¹é ¶óÀÎ ¹«½Ã(&K)" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "´ë¼Ò¹®ÀÚ ¹«½Ã(&C)" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "carriage return ¹«½Ã(&R) (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "À̵¿¿µ¿ª ã±â È°¼ºÈ­" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "ÆÄÀÏ ºñ±³ ¹æ½Ä(&F):" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "´Ù¸¥ ºÎºÐ ¹ß°ß½Ã ¹Ù·Î ÁßÁö(&T)" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "ÁÖ¼® ºñ±³ ¾ÈÇÔ" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "ÆíÁý±â" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "±¸¹® ÇÏÀ̶óÀÌÆ®" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "ÀÚµ¿ ¸®½ºÄµ(&R)" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "¿øº» EOL º¸Á¸(&P)" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "ÅÇ(Tabs)" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "ÅÇ Å©±â(&T):" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "ÅÇ(tab) »ðÀÔ(&T)" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "°ø¹é(space) »ðÀÔ(&N)" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "line differences º¸±â" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "¹®ÀÚ ´ÜÀ§(&C)" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "´Ü¾î ´ÜÀ§(&W):" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "ÆÄÀÏ ÇÊÅÍ" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Å×½ºÆ®" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "¼³Ä¡..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "»õ·Î »ý¼º..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "ÆíÁý..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "»èÁ¦..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "¼öÁ¤ ÆÄÀÏ ÀúÀå" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "¿ÞÂÊ ÆÄÀÏ" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "ÀúÀå(&S)" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "ÀúÀå ¾ÈÇÔ(&D)" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "¿À¸¥ÂÊ ÆÄÀÏ" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "ÀúÀå(&A)" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "ÀúÀå ¾ÈÇÔ(&C)" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "¸ðµÎ ÀúÀå ¾ÈÇÔ" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "±âº» Codepage" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "unicode ÆÄÀÏÀÌ ¾Æ´Ñ ÆÄÀÏÀ» ¿­ ¶§ ±âº»À¸·Î »ç¿ëÇÒ codepage ¸¦ ¼±ÅÃÇÕ´Ï´Ù" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2006,32 +2013,32 @@ msgstr "" "´ÙÀ½ ÆÄÀϵéÀº codepage¸¦ °ËÃâ ÇÕ´Ï´Ù : .html, .rc, .xml \n" "Àç½ÃÀÛ ÇÊ¿äÇÕ´Ï´Ù" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "½Ã½ºÅÛ codepage" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "WinMerge UI¸¦ µû¸§" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "ÀϹÝÀûÀÎ codepage :" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - ¾ÐÃàÆÄÀÏ Áö¿ø ±â´É ºñÈ°¼ºÈ­ »óÅÂ" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "7-Zip ¹öÀüÀ» ¾Ë¾Æ³¾ ¼ö ¾ø½À´Ï´Ù (¼³Ä¡¸¦ ¾ÈÇϼ̳ª¿ä?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2040,24 +2047,24 @@ msgstr "" "¾ÐÃàÆÄÀÏÀº 7-zip(¹öÀü 3.11 ÀÌ»ó)ÀÌ ¼³Ä¡µÇ¾î Àְųª,\n" "´Üµ¶ ½ÇÇàÀ» À§ÇÑ Çʼö ÄÄÆ÷³ÍÆ®¶óµµ ÇÁ·Î±×·¥ µð·ºÅ丮³»¿¡ Á¸ÀçÇؾßÇÕ´Ï´Ù" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "¶ÇÇÑ È£È¯µÇ´Â ÀÎÅÍÆäÀ̽º Ç÷¯±×ÀÎ(Merge7z*.dll)µµ ¼³Ä¡µÇ ÀÖ¾î¾ß ÇÕ´Ï´Ù" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "¾Æ·¡¿¡¼­ ÃßõÇÏ´Â ÀÎÅÍÆäÀ̽º Ç÷¯±×ÀÎÀ» »ç¿ëÇϽñ⠹ٶø´Ï´Ù" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "¹öÀü" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2066,54 +2073,54 @@ msgstr "" "ÇÊ¿äÇÑ Ç÷¯±×ÀÎ\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "ÃßõÇÏ´Â 7-ZipÀÇ ¹öÀü:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "ÀÖÀ½" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "ÇöÀç ¼³Ä¡µÇ¾î ÀÖ´Â 7-Zip:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "¾øÀ½" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "¾øÀ½" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "´Üµ¶ ½ÇÇàÀ» À§ÇÑ 7-Zip ÄÄÆ÷³ÍÆ®:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "±¸¹öÀü" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Ç÷¯±×ÀÎ °æ·Î:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2122,486 +2129,486 @@ msgstr "" "ÀÌ ¸Þ¼¼Áö¸¦ ´Ù½Ã Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù(&M).\n" "(µµ¿ò¸» ¸Þ´º¿¡¼­ ¾ðÁ¦µçÁö ´Ù½Ã ºÒ·¯³¾ ¼ö ÀÖ½À´Ï´Ù.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Ç÷¯±×ÀÎ ´Ù¿î·Îµå" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "¿É¼Ç" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Ä«Å×°í¸®" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "°¡Á®¿À±â..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "³»º¸³»±â..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Å°¿öµå:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "ÇÔ¼ö:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "ÁÖ¼®:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "¼ýÀÚ:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "¿¬»êÀÚ:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "¹®ÀÚ¿­:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Àü󸮱â:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "»ç¿ëÀÚ ¼³Á¤ 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "»ç¿ëÀÚ ¼³Á¤ 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "µð·ºÅ丮 ºñ±³°á°ú ¸®Æ÷Æ®" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "¸®Æ÷Æ® ÆÄÀÏ(&F):" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "Çü½Ä(&S):" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "Ŭ¸³º¸µå·Î º¹»ç(&C)" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Shared / Private Filter" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "»ý¼ºÇÒ ÇÊÅÍ Å¸ÀÔÀ» ¼±ÅÃÇϼ¼¿ä" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Shared Filter (¸ðµç »ç¿ëÀÚ)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Private Filter (ÇöÀç »ç¿ëÀÚ)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "¾ÐÃà ÆÄÀÏ Áö¿ø" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "ºñ±³ ¿ä¾à" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Æú´õ:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "ÆÄÀÏ:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "´Ù¸§" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "ÅؽºÆ®:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "¹ÙÀ̳ʸ®:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "ÇÑÂʸ¸ Á¸Àç" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "¿ÞÂÊ:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "¿À¸¥ÂÊ:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "µ¿ÀÏ" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "´Ý±â" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Àû¿ë" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "ºÒ·¯¿Ã¶§ÀÇ codepage(&F):" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "ÀúÀåÇÒ codepage(&S):" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "¾çÂÊ ¸ðµÎ µ¿ÀÏ codepage Àû¿ë(&U)" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "Àû¿ë(&A)" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "Ãë¼Ò(&C)" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "ÇÊÅÍ Å×½ºÆ®" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "ÇÊÅÍ ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "Å×½ºÆ®ÇÒ ÅؽºÆ® ÀÔ·Â(&T)" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "Æú´õ¸í(&F)" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "°á°ú:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "Å×½ºÆ®(&T)" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "´Ý±â(&C)" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "»ç¿ëÀÚ »ö»ó »ç¿ë(&U)" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "»ç¿ëÀÚ »ö»ó" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "°ø¹é:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "ÅؽºÆ®:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "¼±Åÿµ¿ª:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "°æ·Î" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "ÀбâÀü¿ë(&E)" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "ÀбâÀü¿ë(&A)" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "¿­±â..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "ÀúÀå..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041203b5" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Lee Jae-Hong & Sukjoon" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x412, 949" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Áغñ" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2610,7 +2617,7 @@ msgstr "" "ºó ¹®¼­¸¦ »ý¼ºÇÕ´Ï´Ù\n" "»õ¹®¼­ (Ctrl-N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2619,7 +2626,7 @@ msgstr "" "±âÁ¸¿¡ ¸¸µé¾îÁø ¹®¼­¸¦ ¿±´Ï´Ù.\n" "¿­±â (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2628,7 +2635,7 @@ msgstr "" "ÇöÀç ¹®¼­¸¦ ´Ý½À´Ï´Ù.\n" "´Ý±â" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2637,7 +2644,7 @@ msgstr "" "ÇöÀç ¹®¼­¸¦ ÀúÀåÇÕ´Ï´Ù.\n" "ÀúÀå (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2646,7 +2653,7 @@ msgstr "" "»õÀ̸§À¸·Î ¹®¼­¸¦ ÀúÀåÇÕ´Ï´Ù.\n" "´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2655,7 +2662,7 @@ msgstr "" "Àμ⠿ɼÇÀ» ¼öÁ¤ÇÕ´Ï´Ù.\n" "ÆäÀÌÁö ¼³Á¤" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2664,7 +2671,7 @@ msgstr "" "ÇÁ¸°Å͸¦ ¹Ù²Ù°Å³ª Àμ⠿ɼÇÀ» ¼öÁ¤ÇÕ´Ï´Ù.\n" "Àμ⠼³Á¤" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2673,7 +2680,7 @@ msgstr "" "ÇöÀç ¹®¼­¸¦ ÀμâÇÕ´Ï´Ù.\n" "Àμâ" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2682,12 +2689,12 @@ msgstr "" "¹Ì¸® º¸±â\n" "¹Ì¸® º¸±â" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2696,32 +2703,32 @@ msgstr "" "ÇÁ·ÎÁ§Æ® ¿­±â\n" "ÇÁ·ÎÁ§Æ® ÆÄÀÏ (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "ÇÁ·ÎÁ§Æ®¸¦ ¿©´Â Áß ¾Ë ¼ö ¾ø´Â ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "ÇÁ·ÎÁ§Æ®¸¦ ÀúÀåÇÏ´Â Áß ¾Ë ¼ö ¾ø´Â ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "ÇÁ·ÎÁ§Æ® ÆÄÀÏ" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ¿­·È½À´Ï´Ù." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ÀúÀåµÇ¾ú½À´Ï´Ù." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2730,7 +2737,7 @@ msgstr "" "ÇöÀç °æ·Î¿Í ¿É¼ÇÀ» ÇÁ·ÎÁ§Æ® ÆÄÀÏ¿¡ ÀúÀåÇÕ´Ï´Ù\n" "ÇÁ·ÎÁ§Æ® ÀúÀå" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2739,7 +2746,7 @@ msgstr "" "ÇÁ·Î±×·¥ Á¤º¸, ¹öÀü, ÀúÀÛ±ÇÀ» º¾´Ï´Ù.\n" "Á¤º¸" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2748,9 +2755,6 @@ msgstr "" "ÇÁ·Î±×·¥À» Á¾·áÇÕ´Ï´Ù.\n" "Á¾·á" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2764,11 +2768,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "¼±Åà ¹®¼­ ¿­±â" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2777,7 +2784,7 @@ msgstr "" "´ÙÀ½ â(pane)À¸·Î À̵¿ÇÕ´Ï´Ù.\n" "´ÙÀ½ â(pane)" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2786,7 +2793,7 @@ msgstr "" "ÀÌÀü â(pane)À¸·Î À̵¿ÇÕ´Ï´Ù.\n" "ÀÌÀü â(pane)" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2795,7 +2802,7 @@ msgstr "" "»õ âÀ¸·Î ¹®¼­¸¦ ¿±´Ï´Ù.\n" "»õ âÀ¸·Î" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2804,7 +2811,7 @@ msgstr "" "À©µµ¿ì ¾Æ·¡¿¡ ¾ÆÀÌÄÜÀ» ¹è¿­ÇÕ´Ï´Ù.\n" "¾ÆÀÌÄÜ ¹è¿­" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2813,7 +2820,7 @@ msgstr "" "âµéÀ» °è´Ü½ÄÀ¸·Î ¹è¿­ÇÕ´Ï´Ù.\n" "°è´Ü½Ä ¹è¿­" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2822,7 +2829,7 @@ msgstr "" "âµéÀ» ¼öÆòÀ¸·Î ¹è¿­ÇÕ´Ï´Ù.\n" "¼öÆò ¹è¿­" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2831,7 +2838,7 @@ msgstr "" "âµéÀ» ¼öÁ÷À¸·Î ¹è¿­ÇÕ´Ï´Ù.\n" "¼öÁ÷ ¹è¿­" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2840,7 +2847,7 @@ msgstr "" "ÇöÀç âÀ» ºÐÇÒÇÕ´Ï´Ù.\n" "ºÐÇÒ" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2849,7 +2856,7 @@ msgstr "" "¼±Åà ¿µ¿ªÀ» »èÁ¦ÇÕ´Ï´Ù.\n" "»èÁ¦" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2858,7 +2865,7 @@ msgstr "" "¸ðµÎ »èÁ¦ÇÕ´Ï´Ù.\n" "¸ðµÎ »èÁ¦" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2867,7 +2874,7 @@ msgstr "" "¼±Åà ¿µ¿ªÀ» Ŭ¸³º¸µå·Î º¹»çÇÕ´Ï´Ù.\n" "º¹»ç" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2876,7 +2883,7 @@ msgstr "" "¼±Åà ¿µ¿ªÀ» À߶󳻾î Ŭ¸³º¸µå·Î À̵¿ÇÕ´Ï´Ù.\n" "À߶󳻱â" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2885,7 +2892,7 @@ msgstr "" "ƯÁ¤ ³»¿ëÀ» °Ë»öÇÕ´Ï´Ù.\n" "ã±â" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2894,7 +2901,7 @@ msgstr "" "Ŭ¸³º¸µåÀÇ ³»¿ëÀ» ºÙÀÔ´Ï´Ù.\n" "ºÙÀ̱â" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2903,7 +2910,7 @@ msgstr "" "¸¶Áö¸· ÀÛ¾÷À» ¹Ýº¹ÇÕ´Ï´Ù.\n" "¹Ýº¹" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2912,7 +2919,7 @@ msgstr "" "ƯÁ¤ ³»¿ëÀ» ´Ù¸¥ ³»¿ëÀ¸·Î ¹Ù²ß´Ï´Ù.\n" "¹Ù²Ù±â" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2921,7 +2928,7 @@ msgstr "" "¹®¼­ÀÇ ¸ðµç ¿µ¿ªÀ» ¼±ÅÃÇÕ´Ï´Ù.\n" "¸ðµÎ ¼±ÅÃ" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2930,7 +2937,7 @@ msgstr "" "½ÇÇàÀ» Ãë¼ÒÇÕ´Ï´Ù.\n" "½ÇÇà Ãë¼Ò" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2939,7 +2946,7 @@ msgstr "" "´Ù½Ã ½ÇÇàÇÕ´Ï´Ù.\n" "´Ù½Ã ½ÇÇà" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2948,7 +2955,7 @@ msgstr "" "Åø¹Ù¸¦ º¸°Å³ª ¼û±é´Ï´Ù.\n" "Åø¹Ù º¸±â" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2957,69 +2964,69 @@ msgstr "" "»óÅ ǥ½ÃÁÙÀ» º¸°Å³ª ¼û±é´Ï´Ù.\n" "»óÅÂÇ¥½ÃÁÙ º¸±â" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "âÀÇ Å©±â¸¦ Á¶Á¤ÇÕ´Ï´Ù." -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "âÀÇ À§Ä¡¸¦ À̵¿ÇÕ´Ï´Ù." -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "â Å©±â¸¦ ÃÖ¼ÒÈ­ÇÕ´Ï´Ù." -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "â Å©±â¸¦ ÃÖ´ëÈ­ÇÕ´Ï´Ù." -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "´ÙÀ½ âÀ¸·Î À̵¿ÇÕ´Ï´Ù." -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "ÀÌÀü âÀ¸·Î À̵¿ÇÕ´Ï´Ù." -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "ÇöÀçâÀ» ´Ý½À´Ï´Ù." -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "âÀ» ÀÌÀü Å©±â·Î µÇµ¹¸³´Ï´Ù." -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Task List¸¦ È°¼ºÈ­ÇÕ´Ï´Ù." -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "ÀÌ Ã¢À» È°¼ºÈ­ÇÕ´Ï´Ù." -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3028,7 +3035,7 @@ msgstr "" "¹Ì¸®º¸±â¸¦ Á¾·áÇÕ´Ï´Ù.\n" "¹Ì¸®º¸±â Á¾·á" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3040,23 +3047,23 @@ msgid "" "WinMerge Document" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "¿øº» ÆÄÀÏÀÇ EOL À¯Áö" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "¾Æ¹«Å°³ª ´©¸£¼¼¿ä" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "º¹»çÇÒ °æ·Î¿¡ ¿À¸¥ÂÊ ¹öÆ°À» ´©¸£¼¼¿ä" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3065,152 +3072,152 @@ msgstr "" "°³¹ßÀÚ:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "È®ÀÎ(&O)" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "ÁßÁö(&A)" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "Àç½Ãµµ(&)" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "¹«½Ã(&I)" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "¸ðµÎ ¹«½Ã(&A)" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "¿¹(&Y)" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "¸ðµÎ Àû¿ë(&A)" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "¾Æ´Ï¿À(&N)" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "¸ðµÎ ¾Æ´Ï¿À(&L)" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "°è¼Ó(&C)" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "¹«½Ã(&S)" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "¸ðµÎ ¹«½Ã(&A)" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "ÀÌ ¸Þ½ÃÁö¸¦ ´Ù½Ã Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù(&M)" -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "´Ù½Ã ¹¯Áö ¾Ê½À´Ï´Ù(&Q)" -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "±¸¹® »ö»ó" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "ÅؽºÆ® »ö»ó" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Çü»ó °ü¸®" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "¿É¼Ç (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "ÀÌÁ¦ ¸ðµç ¸Þ¼¼Áö¹Ú½º°¡ È°¼ºÈ­µË´Ï´Ù." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "¼öÁ¤µÇ¾ú½À´Ï´Ù. ¸î¸î ¼³Á¤Àº ÆÄÀϺñ±³¸¦ Àç½ÃÀÛÇÒ ¶§±îÁö Àû¿ëµÇÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "¹Ù²ï ÆùÆ®´Â ÇöÀç ºñ±³Ã¢¿¡´Â Àû¿ëµÇÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3218,7 +3225,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3226,107 +3233,107 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "¿­±â" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ÇÁ·Î±×·¥|*.exe;*.bat;*.cmd|¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ÇÁ·ÎÁ§Æ® ÆÄÀÏ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "¼³Á¤ ÆÄÀÏ (*.ini)|*.ini|All Files (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Àüü ³»¿ë ºñ±³" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "ºü¸¥ ³»¿ë ºñ±³" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "º¯°æµÈ ³¯Â¥" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "º¯°æµÈ ³¯Â¥ & ÆÄÀÏ Å©±â" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "ÆÄÀÏ Å©±â" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "À̸§" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "°æ·Î" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "ÇÊÅÍ" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "¼³¸í" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "»ý¼ºÇÒ ÇÊÅÍÀÇ ÆÄÀϸíÀ» ÀÔ·ÂÇϼ¼¿ä" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3338,7 +3345,7 @@ msgstr "" "\n" "Please copy file %1 to WinMerge/Filters -folder." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3347,7 +3354,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3355,7 +3362,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3364,12 +3371,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3377,208 +3384,208 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "cleartool.exe °æ·Î(&P):" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "SS.EXE °æ·Î(&P):" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "µð·ºÅ丮 ºñ±³ °á°ú" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "ÆÄÀÏ ºñ±³" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "À̸§¾ø´Â ¹®¼­" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "À̸§¾ø´Â ¹®¼­" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "´Ù½Ã ½ºÄµÁßÀÔ´Ï´Ù..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "¼±Åà ÆÄÀÏ ¿©´ÂÁß" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "¿ÞÂÊ¿¡¼­ ¿À¸¥ÂÊÀ¸·Î º¹»çÁß" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "¿À¸¥ÂÊ¿¡¼­ ¿ÞÂÊÀ¸·Î º¹»çÁß" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "¿ÞÂÊÀ¸·Î ¸ðµÎ º¹»çÁß" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "¿À¸¥ÂÊÀ¸·Î ¸ðµÎ º¹»çÁß" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "ÆÄÀÏ º¹»çÁß..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "ÆÄÀÏ »èÁ¦Áß..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "ÆÄÀÏ À̵¿Áß..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "¸®Æ÷Æ® »ý¼ºÁß..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "´Ù¸¥ ÆÄÀÏ(%1 of %2)" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1°³ÀÇ ´Ù¸¥ ºÎºÐ Á¸Àç" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1°³ÀÇ ´Ù¸¥ ºÎºÐ Á¸Àç" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "ºñ±³ÇÒ µð·ºÅ丮 ¶Ç´Â ÆÄÀÏÀ» ¼±ÅÃÇϼ¼¿ä." -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "µð·ºÅ丮 ¼±ÅÃ" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "¿ÞÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "¿À¸¥ÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "¾çÂÊ ¸ðµÎ À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Unpacker ¼±Åà Ȱ¼ºÈ­¸¦ À§ÇØ µÎ ÆÄÀÏÀ» ¼±ÅÃÇϼ¼¿ä." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "µð·ºÅ丮/ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "ÇØ´çÇÏ´Â ÆÄÀÏÀÌ ¾ø½À´Ï´Ù : %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "unpack µÈ ÆÄÀÏ: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3591,7 +3598,7 @@ msgstr "" "\n" "µÎ ÆÄÀÏÀº µ¿ÀÏÇÑ ¹ÙÀ̳ʸ® ÆÄÀÏÀÔ´Ï´Ù." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3604,7 +3611,7 @@ msgstr "" "\n" "µÎ ÆÄÀÏÀº µ¿ÀÏÇÏÁö ¾ÊÀº ¹ÙÀ̳ʸ® ÆÄÀÏÀÔ´Ï´Ù." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3615,7 +3622,7 @@ msgstr "" "\n" "À§ ÆÄÀÏÀº ¹ÙÀ̳ʸ® ÆÄÀÏÀÔ´Ï´Ù. ¹ÙÀ̳ʸ® ÆÄÀÏ°ú ÅؽºÆ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3628,37 +3635,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "%1 ÀÇ º¯°æµÈ ºÎºÐÀ» ÀúÀåÇÒ±î¿ä?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "º¹»ç °¡´É üũ ½ÇÆÐ" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "ÆÄÀÏ ¹é¾÷À» ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3671,7 +3678,7 @@ msgstr "" "\n" "°è¼Ó ÁøÇàÇÒ±î¿ä?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3687,7 +3694,7 @@ msgstr "" "\t- ´Ù¸¥À̸§À¸·Î ÀúÀå(È®ÀÎ)\n" "\t- ÀúÀå Ãë¼Ò(Ãë¼Ò)?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3697,7 +3704,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3707,7 +3714,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3721,7 +3728,7 @@ msgstr "" "\n" "µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3730,7 +3737,7 @@ msgstr "" "%1\n" "Àбâ Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î¾²½Ã°Ú½À´Ï±î?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3744,17 +3751,17 @@ msgstr "" "\n" "º¯°æµÈ ÆÄÀÏ ³»¿ëÀ» º¸·Á¸é Áö±Ý ÆÄÀÏÀ» ´Ý°í ´Ù½Ã ¿­¾îÁÖ¼¼¿ä." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "¿ÞÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3765,42 +3772,42 @@ msgstr "" "\n" "°è¼ÓÇϱâ Àü¿¡ »õ·Î°íħÀ» ÇØÁÖ¼¼¿ä." -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "°è¼ÓÇϽ÷Á¸é ¼Ò½º¼¼ÀÌÇÁ ÇÁ·ÎÁ§Æ® °æ·Î¸¦ ¼³Á¤ÇϼžßÇÕ´Ï´Ù (¿¹: $/MyProject)" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "VSS üũ¾Æ¿ô ÆÄÀÏ..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "üũ¾Æ¿ô ½ÇÇà Áß ¿¡·¯°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù. ´õ ÀÌ»ó ÁøÇàÇÒ ¼ö ¾ø½À´Ï´Ù..." -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "¹öÀü°ü¸®½Ã½ºÅÛ ¸í·É ½ÇÇà ½ÇÆÐ." -#: Merge.rc:2107 +#: Merge.rc:2110 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ¿öÅ· Æú´õ¿Í ÇöÀç ÆÄÀÏÀÇ °æ·Î°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù. °è¼ÓÇÏ°Ú½À´Ï±î?" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "VSS database(s)°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "VSS ¿¡·¯:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3808,186 +3815,186 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2114 #, 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "»ç¿ë¾ÈÇÔ" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "°ø¹é ¹ß°ß½Ã ¸ØÃã" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "°ø¹é ¶Ç´Â ±¸µÎÁ¡ ¹ß°ß½Ã ¸ØÃã" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "¼±Åà ÆÄÀÏÀ» ¿À¸¥ÂÊ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "¼±Å ÆÄÀÏÀ» ƯÁ¤ µð·ºÅ丮·Î º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿ÞÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù." -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "¼±ÅÃÇÑ ÆÄÀÏ Áß ¿À¸¥ÂÊ ÆÄÀϸ¸ »èÁ¦ÇÕ´Ï´Ù." -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "¼±ÅÃÇÑ ÆÄÀÏÀ» ¾çÂÊ ¸ðµÎ¿¡¼­ »èÁ¦ÇÕ´Ï´Ù." -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "¼±Åà ÆÄÀÏÀ» °¨Ãä´Ï´Ù (on the fly filter)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "¾çÂÊÀÇ ¼±Åà ÆÄÀÏ ¸ðµÎ À̸§À» ¹Ù²ß´Ï´Ù" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "¿ÞÂÊÀ¸·Î (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "¿À¸¥ÂÊÀ¸·Î (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "¿ÞÂÊÀ¸·Î (%1 of %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "¿À¸¥ÂÊÀ¸·Î (%1 of %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "¿ÞÂÊÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "¿À¸¥ÂÊÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "¿ÞÂÊÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 of %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "¿À¸¥ÂÊÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 of %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "¿ÞÂÊ (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "¿À¸¥ÂÊ (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "¸ðµÎ (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "¿ÞÂÊ (%1 of %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "¿À¸¥ÂÊ (%1 of %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "¸ðµÎ (%1 of %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "µð·ºÅ丮 ¼±ÅÃ" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "¿ÞÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "¿À¸¥ÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿ÞÂÊ ÆÄÀÏ·Î º¹»çÇÒ±î¿ä?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿À¸¥ÂÊ ÆÄÀÏ·Î º¹»çÇÒ±î¿ä?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4001,17 +4008,17 @@ msgstr "" "%2\n" "·Î º¹»çÇϽðڽÀ´Ï±î?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "¼±ÅÃÇÑ ÆÄÀÏÀ» Á¤¸» º¹»çÇϽðڽÀ´Ï±î(%1 of %2)" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Á¤¸» »èÁ¦ÇϽðڽÀ´Ï±î(%1 of %2)?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4021,7 +4028,7 @@ msgstr "" "%1\n" "µð·ºÅ丮¸¦ »èÁ¦ÇϽðڽÀ´Ï±î?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4032,17 +4039,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4054,458 +4061,458 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "¿ÞÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù." -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "¿ÜºÎ ¿¡µðÅ͸¦ ÀÌ¿ëÇؼ­ ¿ÞÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "¿ÞÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù. ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù." -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "¿ÜºÎ ¿¡µðÅ͸¦ ÀÌ¿ëÇؼ­ ¿À¸¥ÂÊ ÆÄÀÏÀ» ¿±´Ï´Ù" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "¿À¸¥ÂÊ ÆÄÀÏÀ» ¿¬°á ÇÁ·Î±×·¥À» ¼±ÅÃÇؼ­ ¿±´Ï´Ù. ..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "¿ÜºÎ ÆíÁý±â ½ÇÇà ½ÇÆÐ: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "¾Ë ¼ö ¾ø´Â È®ÀåÀÚ: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "ÆÄÀϸíÀ» Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "¿ÞÂÊ °æ·Î¸¦ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "¿À¸¥ÂÊ °æ·Î¸¦ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "¾çÂÊ °æ·Î¸¦ ¸ðµÎ Ŭ¸³º¸µå¿¡ º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "¾Ë ¼ö ¾ø´Â ¾ÐÃà Æ÷¸Ë" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "¿ÞÂÊ ÆÄÀÏ ¾ÐÃàÆÄÀÏ¿¡ ´õÇϱâ" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¾ÐÃàÆÄÀÏ¿¡ ´õÇϱâ" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "¾çÂÊ ÆÄÀÏ ¸ðµÎ ¾ÐÃàÆÄÀÏ¿¡ ´õÇϱâ" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "´Ù¸¥ ÆÄÀÏ ¾ÐÃàÆÄÀÏ¿¡ ´õÇϱâ (¾çÂÊ)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "¿ÞÂÊ ¼±ÅÃÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "¿À¸¥ÂÊ ¼±ÅÃÆÄÀÏ À§Ä¡ÁöÁ¤ À̵¿" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "À̸§" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "µð·ºÅ丮" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "ºñ±³ °á°ú" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "¿ÞÂÊ ³¯Â¥" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "¿À¸¥ÂÊ ³¯Â¥" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "È®ÀåÀÚ" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "¿ÞÂÊ Å©±â" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "¿À¸¥ÂÊ Å©±â" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "¿À¸¥ÂÊ Å©±â (ª°Ô)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "¿ÞÂÊ Å©±â (ª°Ô)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "¿ÞÂÊ »ý¼º ½Ã°£" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "ÃֽŠÆÄÀÏ" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "¿ä¾à °á°ú" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "¿ÞÂÊ ¼Ó¼º" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "¿À¸¥ÂÊ ¼Ó¼º" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "¿ÞÂÊ EOL" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "¿À¸¥ÂÊ EOL" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "¿ÞÂÊ ÀÎÄÚµù" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "¿À¸¥ÂÊ ÀÎÄÚµù" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "ºñ±³ÇÏÁö ¾ÊÀº ´Ù¸¥ ºÎºÐ" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "´Ù¸¥ ºÎºÐ" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "¹ÙÀ̳ʸ®" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "ºñ±³ ÁßÁöµÈ ÆÄÀÏ" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "ÇÊÅ͸µµÈ ÆÄÀÏ" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "ÇÊÅ͸µµÈ µð·ºÅ丮" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "µ¿ÀÏÇÑ ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "¿ÞÂʸ¸ Á¸Àç" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "¿À¸¥Âʸ¸ Á¸Àç" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "°É¸° ½Ã°£: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 Ç׸ñ ¼±ÅÃ" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 Ç׸ñ ¼±ÅÃ" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "µð·ºÅ丮 À̸§ ¶Ç´Â ÆÄÀÏ À̸§." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "ÇÏÀ§ µð·ºÅ丮°¡ ÀÖÀ»¶§ ÇÏÀ§ µð·ºÅ丮 À̸§." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "ÀÚ¼¼ÇÑ ºñ±³ °á°ú." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "¿ÞÂÊ ¼öÁ¤ ½Ã°£." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "¿À¸¥ÂÊ ¼öÁ¤ ½Ã°£." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "ÆÄÀÏ È®ÀåÀÚ." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(byte)." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(byte)." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(ª°Ô)" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(ª°Ô)" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "¿ÞÂÊ »ý¼º ½Ã°£." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "¾î´ÀÂÊÀÌ ´õ ÃÖ±Ù¿¡ ¼öÁ¤µÈ °ÇÁö ¾Ë·ÁÁÝ´Ï´Ù." -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "°£·«ÇÑ ¿ä¾à °á°ú." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "¿ÞÂÊ ¼Ó¼º." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "¿À¸¥ÂÊ ¼Ó¼º." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "¿ÞÂÊ EOL" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "¿À¸¥ÂÊ EOL" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "¿ÞÂÊ ÀÎÄÚµù." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "¿À¸¥ÂÊ ÀÎÄÚµù." -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ÆÄÀÏ ³» ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö. winmerge ¿¡¼­ À̺κÐÀº ¹«½ÃµÇ¸ç, merge µÇÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ÆÄÀϳ» ´Ù¸¥ ºÎºÐÀÇ °³¼ö. ÀÌ´Â ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö¸¦ Æ÷ÇÔÇÏÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀ̸é * Ç¥½Ã." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "%1 & %2 ºñ±³" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "¸®Æ÷Æ® ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4514,47 +4521,47 @@ msgstr "" "¸®Æ÷Æ® »ý¼º ½ÇÆÐ:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "¸®Æ÷Æ® »ý¼º ¼º°ø" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "¾çÂÊ Ã¢¿¡ µ¿ÀÏÇÑ ÆÄÀÏÀÌ ¿­·ÁÀÖ½À´Ï´Ù." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "¼±ÅÃÇÑ ÆÄÀϵéÀº ³»¿ëÀÌ µ¿ÀÏÇÕ´Ï´Ù.." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "ÇÑÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â µð·ºÅ丮ÀÔ´Ï´Ù." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "ÆÄÀÏ ºñ±³ µµÁß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Àӽà ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù. Àӽà ÆÄÀÏ ¼³Á¤À» È®ÀÎÇϼ¼¿ä." -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "µð·ºÅ丮´Â ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4569,7 +4576,7 @@ msgstr "" "\n" "Âü°í: ¸ðµç CRÀ» Ç×»ó µ¿ÀÏÇÏ°Ô ÀÛ¾÷ÇÏ±æ ¿øÇϽŴٸé, ºñ±³ÅÇ¿¡¼­ 'carriage return ¹«½Ã' ¿É¼ÇÀ» ¼±ÅÂÇÏ¸é µË´Ï´Ù (ÆíÁý/¿É¼Ç ¿¡¼­ ¼±Åà °¡´É)." -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4580,22 +4587,22 @@ msgstr "" " ÇöÀç ¿É¼ÇÀ¸·Î´Â ¸ðµç EOLÀÌ Çϳª·Î ¹Ù²î°Ô µË´Ï´Ù.\n" " ¿øº» EOLÀ» À¯ÁöÇϱ⠿øÇϽʴϱî ?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "'%2' Ç÷¯±×ÀÎÀ¸·Î '%1'À» prediffÇÏ´Â Áß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù. ´õ ÀÌ»ó prediff°¡ ¼öÇàµÇÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "¼±Åà µð·ºÅ丮 °æ·Î ¿À·ùÀÔ´Ï´Ù." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4606,132 +4613,132 @@ msgstr "" "°¢°¢ÀÇ codepage¸¦ À¯ÁöÇÏ´Â °ÍÀÌ ÀÛ¾÷½Ã º¸±â´Â ÁÁÀ¸³ª À§ÇèÇÒ ¼ö ÀÖ½À´Ï.\n" "±âÁ¸ À©µµ¿ì codepage ¸¦ »ç¿ëÇÒ±î¿ä(Ãßõ)?" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "°æ°í: ¾çÂÊ ÆÄÀÏÀÌ ÀÎÄÚµùÀÌ Æ²¸³´Ï´Ù, ¿ÞÂÊ=%s and ¿À¸¥ÂÊ=%s, merge ÀÛ¾÷ ÁøÇà½Ã Á¤º¸¸¦ ÀÒ¾î¹ö¸± ¼ö ÀÖ½À´Ï´Ù." -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "µ¿ÀÏÇÔ" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "¶óÀÎ ºñ±³" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "¸ðµÎ %1 °³¸¦ ¹Ù²Ù¾ú½À´Ï´Ù." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "ÇØ´çÇÏ´Â ¹®ÀÚ¿­À» ãÀ» ¼ö ¾ø½À´Ï´Ù : \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Àüü °æ·Î º¹»ç" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "ÆÄÀÏ À̸§ º¹»ç" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "À§Ä¡Ã¢" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "ºñ±³Ã¢" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Patch ÆÄÀÏÀÌ ÀÛ¼ºµÇ¾ú½À´Ï´Ù." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "°°Àº À̸§ÀÇ ÆÐÄ¡°¡ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 °³ÀÇ ÆÄÀÏ ¼±ÅõÊ]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "%1 ÆÄÀÏ¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Àý´ë°æ·Î°¡ ¾Æ´Õ´Ï´Ù: %1" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏ¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "µð·ºÅ丮¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4742,17 +4749,17 @@ msgstr "" "\n" "ÀúÀå¾ÈµÈ ÆÄÀÏÀÌ ÀÖÀ¸¸é ÆÐÄ¡¸¦ ¼º¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Á¸ÀçÇÏÁö ¾Ê´Â µð·ºÅ丮ÀÔ´Ï´Ù." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "ÇöÀç µð·ºÅ丮 ºñ±³ °á°ú°¡ ´ÝÈü´Ï´Ù." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4764,51 +4771,51 @@ msgstr "" "¾ÐÃà Áö¿ø ±â´É¿¡ ÇÊ¿äÇÑ ÄÄÆ÷³ÍÆ®(7-zip and/or Merge7z*.dll)°¡ ¾ø½À´Ï´Ù. \n" "¾ÐÃà Áö¿ø ±â´É¿¡ ´ëÇØ ´õ ¸¹Àº Á¤º¸¸¦ ¿øÇÏ½Ã¸é ¸Þ´º¾óÀ» ÂüÁ¶Çϼ¼¿ä." -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4816,1110 +4823,1110 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Á¤±Ô Ç¥Çö½Ä ¿À·ù" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "µ¿ÀÏÇÏÁö ¾ÊÀ½" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "À߸øµÈ Á¤±Ô Ç¥Çö½Ä" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "À߸øµÈ collation ¹®ÀÚ" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "À߸øµÈ ¹®ÀÚ Å¬·¡½º(character class) À̸§" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "¹é½½·¡½¬ ¶¼¾î³»±â" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "À߸øµÈ ÈÄÂüÁ¶(backreference)" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "ÀÏÄ¡ÇÏÁö ¾Ê´Â [ ¶Ç´Â [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "ÀÏÄ¡ÇÏÁö ¾Ê´Â ( ¶Ç´Â \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "ÀÏÄ¡ÇÏÁö ¾Ê´Â \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\} ³»¿ë ¿À·ù" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "À߸øµÈ ¹üÀ§" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "¸Þ¸ð¸® ºÎÁ·" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "À߸øµÈ ¼±Çà(preceding) Á¤±Ô Ç¥Çö½Ä" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "À̸¥(premature) Á¤±Ô Ç¥Çö½Ä Á¾°á" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "³Ê¹« Å« Á¤±Ô Ç¥Çö½Ä" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "ÀÏÄ¡ÇÏÁö ¾Ê´Â ) ¶Ç´Â \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "³²¾ÆÇÁ¸®Ä«³×´ú¶õµå¾î / ¾ÆÇÁ¸®Ä­½º¾î" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "¾Ë¹Ù´Ï¾Æ¾î" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "¾Æ¶ø¾î (Saudi Arabian)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "¾Æ¶ø¾î (Iraq)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "¾Æ¶ø¾î (Egyptian)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "¾Æ¶ø¾î (Libyan)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "¾Æ¶ø¾î (Algerian)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "¾Æ¶ø¾î (Moroccan)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "¾Æ¶ø¾î (Tunisian)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "¾Æ¶ø¾î (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "¾Æ¶ø¾î (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "¾Æ¶ø¾î (Syrian)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "¾Æ¶ø¾î (Jordan)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "¾Æ¶ø¾î (Lebanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "¾Æ¶ø¾î (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "¾Æ¶ø¾î (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "¾Æ¶ø¾î (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "¾Æ¶ø¾î (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "¾Æ¸£¸Þ´Ï¾Æ¾î" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "¾ÆÁ¦¸£¾î (Latin)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "¾ÆÁ¦¸£¾î (Cyrillic)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "¹Ù½ºÅ©¾î" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "º§·Î·ç½Ã¾î" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "ºÒ°¡¸®¾Æ¾î" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Ä«Å»·ç³Ä¾î" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Áß±¹¾î (Traditional)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Áß±¹¾î (Simplified)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Áß±¹¾î (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Áß±¹¾î (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Áß±¹¾î (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Å©·Î¾ÆƼ¾Æ¾î" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "üÄÚ¾î" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "µ§¸¶Å©¾î" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "³×´ú¶õµå¾î / È­¶õ¾î" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "³×´ú¶õµå¾î / È­¶õ¾î (Belgium)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "¿µ¾î (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "¿µ¾î (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "¿µ¾î (Australian)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "¿µ¾î (Canadian)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "¿µ¾î (New Zealand)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "¿µ¾î (Irish)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "¿µ¾î (So. African)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "¿µ¾î (Jamaican)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "¿µ¾î (Caribbean)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "¿µ¾î (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "¿µ¾î (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "¿µ¾î (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "¿µ¾î (Philippines)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "¿¡½ºÅä´Ï¾Æ¾î" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Æä·Î¾î" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Æ丣½Ã¾Æ¾î" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Çɶõµå¾î" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "ÇÁ¶û½º¾î" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "ÇÁ¶û½º¾î (Belgique)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "ÇÁ¶û½º¾î (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "ÇÁ¶û½º¾î (Switzerland)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "ÇÁ¶û½º¾î (Luxembourg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "ÇÁ¶û½º¾î (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "±×·çÁö¾Æ¾î" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "µ¶ÀϾî (Germany)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "µ¶ÀϾî (Switzerland)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "µ¶ÀϾî (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "µ¶ÀϾî (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "µ¶ÀϾî (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "±×¸®½º¾î" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "È÷ºê¸®¾î" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "ÈùµÎ¾î" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Çë°¡¸®¾î" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "¾ÆÀ̽½¶õµå¾î" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Àεµ³×½Ã¾Æ¾î" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "ÀÌÅ»¸®¾Æ¾î" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "ÀÌÅ»¸®¾Æ¾î (Swiss)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "ÀϺ»¾î" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Ä«½¬¹Ì¸£¾î (India)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Ä«ÀÚÈ彺ź¾î / Ä«ÀÛ¾î" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Çѱ¹¾î" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Çѱ¹¾î(Á¶ÇÕ)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "¶óÆ®ºñ¾Æ¾î" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "¸®Åõ¾Æ´Ï¾Æ¾î" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "¸»·¹À̾î (Malaysian)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "¸»·¹À̾î (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "³ë¸£¿þÀ̾î (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "³ë¸£¿þÀ̾î (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Æú¶õµå¾î" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Æ÷¸£Åõ°¥¾î" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "ºê¶óÁú Æ÷¸£Åõ°¥¾î" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "·ç¸¶´Ï¾Æ¾î" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "·¯½Ã¾Æ¾î" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "¼¼¸£ºñ¾Æ¾î (Latin)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "¼¼¸£ºñ¾Æ¾î (Cyrillic)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "½½·Î¹ÙÅ°¾Æ¾î" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "½½·Îº£´Ï¾Æ¾î" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Mexican)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Dominican)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "½ºÆäÀξî / ¿¡½ºÆijľî (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "½º¿ÍÈú¸®¾î (Kenya)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "½º¿þµ§¾î" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "½º¿þµ§¾î (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "ŸÀ̾î" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "ÅÍÅ°¾î" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "¿ìÅ©¶óÀ̳ª¾î" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "º£Æ®³²¾î / ¿ù³²¾î" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "¿ÞÂÊ ÆÄÀÏ ÀúÀå" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ÀúÀå" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "¿ÞÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "¿À¸¥ÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "¿ÞÂÊ µð·ºÅ丮/ÆÄÀÏ Àб⠼Ӽº º¯°æ" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "¿À¸¥ÂÊ µð·ºÅ丮/ÆÄÀÏ Àб⠼Ӽº º¯°æ" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "DOS ¸ðµå·Î EOL º¯°æ" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "UNIX ¸ðµå·Î EOL º¯°æ" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "MAC ¸ðµå·Î EOL º¯°æ" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "ÆíÁý ¸ðµå/Merge ¸ðµå Àüȯ" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5928,7 +5935,7 @@ msgstr "" "ÇöÀç ¶óÀο¡¼­ ´Ù¸¥ ºÎºÐÀ» ¼±ÅÃÇÕ´Ï´Ù\n" "ÇöÀç ¶óÀο¡¼­ ´Ù¸¥ ºÎºÐ" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5937,7 +5944,7 @@ msgstr "" "¼±Åà ¶óÀÎÀ̳ª ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù\n" "À̵¿ (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5946,7 +5953,7 @@ msgstr "" "¿É¼ÇÀ» ¼³Á¤ÇÕ´Ï´Ù.\n" "¿É¼Ç" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -5955,37 +5962,37 @@ msgstr "" "»õ·Î °íħ\n" "»õ·Î °íħ (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "ÇöÀç ¶óÀÎ ¾Õ¿¡ Çà¹øÈ£¸¦ ºÙ¿©¼­ Ŭ¸³º¸µå·Î º¹»çÇÕ´Ï´Ù" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "¼±ÅÃµÈ ÆÄÀÏÀ» »õ·Î°íħ" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "ºÏ¸¶Å© Åä±Û" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "´ÙÀ½ ºÏ¸¶Å©·Î À̵¿" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "ÀÌÀü ºÏ¸¶Å©·Î À̵¿" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "¸ðµç ºÏ¸¶Å© »èÁ¦" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5994,7 +6001,7 @@ msgstr "" "µ¿ÀÏÇÑ ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "µ¿ÀÏÇÑ ÆÄÀÏ º¸À̱â" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6003,7 +6010,7 @@ msgstr "" "´Ù¸¥ ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "´Ù¸¥ ÆÄÀÏ º¸À̱â" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6012,7 +6019,7 @@ msgstr "" "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "¿ÞÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸À̱â" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6021,7 +6028,7 @@ msgstr "" "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸À̱â" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6030,7 +6037,7 @@ msgstr "" "¹ÙÀ̳ʸ® ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "¹ÙÀ̳ʸ® ÆÄÀÏ º¸À̱â" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6039,7 +6046,7 @@ msgstr "" "ºñ±³ÇÏÁö ¾ÊÀº ÆÄÀÏÀ» Ç¥½ÃÇÕ´Ï´Ù.\n" "ºñ±³ÇÏÁö ¾ÊÀº ÆÄÀÏ º¸À̱â" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6048,7 +6055,7 @@ msgstr "" "ÆùÆ®¸¦ ¼±ÅÃÇÕ´Ï´Ù\n" "ÆùÆ® ¼±ÅÃ" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6057,27 +6064,27 @@ msgstr "" "½Ã½ºÅÛ ±âº» ÆùÆ®·Î ¼³Á¤ÇÕ´Ï´Ù.\n" "±âº» ÆùÆ®" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "°ø¹é¹®ÀÚ¸¦ Ç¥½ÃÇÕ´Ï´Ù." -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "¼±Åà ºñ±³Ã¢À» º¸°Å³ª ¼û±é´Ï´Ù." -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "À§Ä¡ Ç¥½ÃâÀº Àüü ºñ±³ »óȲÀ» À̹ÌÁö·Î º¸¿©ÁÝ´Ï´Ù." -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "µð·ºÅ丮 ºñ±³ »óȲÀ» Ç¥½ÃÇÕ´Ï´Ù." -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6086,7 +6093,7 @@ msgstr "" "¾ð¾î¸¦ ¼±ÅÃÇÕ´Ï´Ù.\n" "¾ð¾î" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6095,12 +6102,12 @@ msgstr "" "ÇöÀç ¶óÀο¡¼­ ´Ù¸¥ ºÎºÐÀ» ´Ù¸¥»öÀ¸·Î º¸¿©ÁÝ´Ï´Ù.\n" "Line Diff º¸À̱â" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "µÎ â(pane)ÀÇ À§Ä¡¸¦ ¼­·Î ¹Ù²ß´Ï´Ù." -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6109,7 +6116,7 @@ msgstr "" "Çà¹øÈ£¸¦ Ç¥½ÃÇÕ´Ï´Ù.\n" "Çà¹øÈ£ º¸À̱â" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6118,24 +6125,24 @@ msgstr "" "ÀÚµ¿ÁÙ¹Ù²Þ ±â´ÉÀ» »ç¿ëÇÕ´Ï´Ù.\n" "ÀÚµ¿ÁٹٲÞ" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6144,7 +6151,7 @@ msgstr "" "ÀÌÀü ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù.\n" "ÀÌÀü ´Ù¸¥ ºÎºÐ (Alt Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6153,7 +6160,7 @@ msgstr "" "´ÙÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù.\n" "´ÙÀ½ ´Ù¸¥ ºÎºÐ (Alt Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6162,7 +6169,7 @@ msgstr "" "óÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù.\n" "óÀ½ ´Ù¸¥ ºÎºÐ (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6171,7 +6178,7 @@ msgstr "" "ÇöÀç ¼±ÅõǾî ÀÖ´Â ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù.\n" "ÇöÀç ¼±ÅÃµÈ ´Ù¸¥ ºÎºÐ (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6180,7 +6187,7 @@ msgstr "" "¸¶Áö¸· ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù.\n" "¸¶Áö¸· ´Ù¸¥ ºÎºÐ (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6189,7 +6196,7 @@ msgstr "" "¼±Åà ¿µ¿ªÀ» ¿À¸¥ÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù.\n" "¿À¸¥ÂÊÀ¸·Î º¹»ç (Alt Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6198,7 +6205,7 @@ msgstr "" "¼±Åà ¿µ¿ªÀ» ¿ÞÂÊÀ¸·Î º¹»çÇÕ´Ï´Ù.\n" "¿ÞÂÊÀ¸·Î º¹»ç (Alt Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6207,7 +6214,7 @@ msgstr "" "´Ù¸¥ ºÎºÐÀ» ¿À¸¥ÂÊÀ¸·Î º¹»çÇÏ°í, ´ÙÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù\n" "¿À¸¥ÂÊÀ¸·Î º¹»ç - Advance (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6216,7 +6223,7 @@ msgstr "" "´Ù¸¥ ºÎºÐÀ» ¿ÞÂÊÀ¸·Î º¹»çÇÏ°í, ´ÙÀ½ ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù\n" "¿ÞÂÊÀ¸·Î º¹»ç - Advance (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6225,7 +6232,7 @@ msgstr "" "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿À¸¥ÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n" "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6234,72 +6241,72 @@ msgstr "" "¸ðµç ´Ù¸¥ ºÎºÐÀ» ¿ÞÂÊ ÆÄÀÏ·Î º¹»çÇÕ´Ï´Ù.\n" "¸ðµÎ ¿ÞÂÊÀ¸·Î" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "¾çÂÊ ÆÄÀÏÀ» ¸ðµÎ »èÁ¦ÇÕ´Ï´Ù." -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "¼±ÅÃµÈ ÆÄÀϵéÀ» ºñ±³ÇÕ´Ï´Ù (¿©·¯°³°¡ ¼±ÅõǾî ÀÖÀ¸¸é ù¹ø° ÆÄÀÏÀ» ¸ÕÀú ºñ±³ÇÕ´Ï´Ù)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "µð·ºÅ丮 ºñ±³ ¼³Á¤ ¼±ÅÃ/¼ø¼­ º¯°æ" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "patch ÆÄÀÏ »ý¼º" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "ÇÊÅÍ ¼±ÅÃ/¼öÁ¤" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "ºñ±³°á°ú ¸®Æ÷Æ® »ý¼º" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "unpacker¸¦ ¼±ÅÃÇÕ´Ï´Ù (µð·ºÅ丮 ºñ±³¿¡´Â unapcking ÇÏÁö ¾Ê½À´Ï´Ù)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "¾çÂÊ ÆÄÀÏ ¸ðµÎ¿¡ unpacker °¡ Àû¿ëµË´Ï´Ù (one file only needs the extension)" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "ÀÌ ÆÄÀÏÀÇ ÆíÁýÀ» À§ÇÑ unpacker¸¦ ¼±ÅÃÇϼ¼¿ä" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "prediffer »ç¿ë ¾ÈÇÔ(normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "±ÇÀåÇÏ´Â Ç÷¯±×ÀÎ" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "´Ù¸¥ Ç÷¯±×ÀÎ" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "¸ðµç Ç÷¯±×ÀÎÀ» ³»¸®°í ´Ù½Ã ·Îµå (for °³¹ßÀÚ)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6308,12 +6315,12 @@ msgstr "" "´ÙÀ½ ÆÄÀÏÀ» È°¼ºÈ­ÇÕ´Ï´Ù\n" "´ÙÀ½ ÆÄÀÏ È°¼ºÈ­" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "¸ðµç ⠴ݱâ" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6322,22 +6329,22 @@ msgstr "" "WinMerge À¯Àú °¡À̵带 º¾´Ï´Ù.\n" "µµ¿ò¸»" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "WinMerge ¹öÀüÁ¤º¸ ¹× ¼³Á¤À» ÅؽºÆ® ÆÄÀÏ·Î Ãâ·ÂÇÕ´Ï´Ù" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "GNU public license º¾´Ï´Ù." -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6346,7 +6353,7 @@ msgstr "" "µµ¿ò¸»(»öÀÎ)À» º¾´Ï´Ù.\n" "µµ¿ò¸» »öÀÎ" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6355,267 +6362,272 @@ msgstr "" "µµ¿ò¸»(°Ë»ö)À» º¾´Ï´Ù.\n" "µµ¿ò¸» °Ë»ö" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Ç÷¯±×ÀÎ ¼¼ÆÃ" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "prediffer »ç¿ë¾ÈÇÔ" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "prediff »ç¿ë °¡´ÉÇÏ¸é »ç¿ëÇϱâ" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH Á¸Àç ÇÏÁö ¾ÊÀ½ - .sct ½ºÅ©¸³Æ®¸¦ »ç¿ëÇÏÁö ¾ÊÀ½" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "<»ç¿ë¾ÈÇÔ>" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "<ÀÚµ¿>" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "¼³Á¤µÈ ÇÁ·Î±×·¥À¸·Î ÆÄÀÏÀ» ¿±´Ï´Ù" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "¿ÜºÎ ÆíÁý±â·Î ÆÄÀÏÀ» ¿±´Ï´Ù" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "ÆÄÀÏÀ» ¿­ ƯÁ¤ ÇÁ·Î±×·¥À» ¼±ÅÃÇÕ´Ï´Ù" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "À̵¿¿µ¿ªÀ» Ç¥½ÃÇÏÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "¸ðµç À̵¿¿µ¿ªÀ» Ç¥½ÃÇÕ´Ï´Ù." -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "ÇöÀç ¼±ÅÃµÈ À̵¿¿µ¿ª¸¸ Ç¥½ÃÇÕ´Ï´Ù." -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Ä¿¼­°¡ ÀÖ´Â ´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù." -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "´Ù¸¥ ºÎºÐÀ¸·Î À̵¿ÇÕ´Ï´Ù. (%1 of %2)" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "%1¶óÀÎÀ¸·Î À̵¿" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "»ç¿ë¾ÈÇÔ" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "ÆÄÀÏ ½Ã½ºÅÛ ÀÌ¿ë" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "MRU(Most Recently Used) list ÀÌ¿ë" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Norwegian.po b/Src/Languages/Norwegian.po index 1943cd927..35fe9b6b8 100644 --- a/Src/Languages/Norwegian.po +++ b/Src/Languages/Norwegian.po @@ -71,7 +71,7 @@ msgstr "&Klipp ut" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "Ko&pier" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "&Lim inn" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "Gå &til..." @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "med ®istrert program" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "med &ekstern editor" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&med..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Filer" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Åpne...\tCtrl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Åpne prosjekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -158,1845 +158,1852 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "L&ukk" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Rediger" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Innstillinger..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Vis" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Velg &skrifttype..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Bruk standard s&krifttype" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "S&tatuslinje" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "S&pråk..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Verktøy" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filter..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Generer rettelse..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Programtillegg" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "&Manual utpakking" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk utpakking" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Rediger med utpakker" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Oppdater programtillegg" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Vindu" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Lukk" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "&Endre vindu\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "&Horisontale vinduer" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "&Vertikale vinduer" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Kaskade" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Hjelp" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Innhold...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "" #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "" #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "K&onfigurasjon..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "A&rkivstøtte deaktivert..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "GNU General Public License..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&Om WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Åpne prosjekt...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "V&entsre skrivebeskyttet" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "H&øyre skrivebeskyttet" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Velg &alt\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Oppdater\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Flette" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Neste forskjell\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Forrige forskjell\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "F&ørste forskjell\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuell forskjell\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Siste forskjell\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopier til &høyre\tAlt+Høyre" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopier til &venstre\tAlt+Venstre" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Tilpass kolonner..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Lagre\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Lagre &venstre" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Lagre" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Lagre &som..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Lagre &høyre" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "&Flettemodus\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Angre\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Gjenopprett\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klipp ut\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&pier\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Lim inn\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Sø&k...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Erstatt...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Skript" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Tom >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Avansert" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopier med linjenummer\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gå til...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "&Vis mellomrom" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "V&is linjeforksjell" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "&Forskjellsvindu" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "&Lokasjonsvindu" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopier t&il høyre og gå videre\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopier &til venstre og gå videre\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Kopier alt &til høyre" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Kopier alt til ve&nstre" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Forhåndsforskjell" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&Venstre til høyre" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "V&enstre til..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "&Høyre til venstre" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "H&øyre til..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Flytt" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Venstre til..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&Høyre til..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Slett" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Venstre" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Høyre" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Begge" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "&Åpne venstre" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Å&pne høyre" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Kop&ier stinavn" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Venstre (%1 av %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Høyre (%1 av %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Begge (%1 av %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Kopier &filnavn" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Venstre... (%1 av %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Høyre... (%1 av %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Begge... (%1 av %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Forskjellene... (%1 av %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "&Kopier full sti" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Kopier &filnavn" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Instillinger for forhåndsforskjell" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Ingen forhåndsforskjell" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "&Autoforhåndsforskjell" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "G&å til forskjell" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Ingen flyttede blokker" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Alle flyttede blokker" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttet blokk for g&jeldende forskjell" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Alle rettigheter forbeholdes" -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besøk WinMerge sin hjemmeside!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Velg filer eller mapper..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Venstre:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Åpne..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Høyre:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "Å&pne..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Velg..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "&Utpakker:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "&Velg..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Inkluder undermapper" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Avbryt" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Hjelp" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller mapper som skal sammenlignes" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Prosjekt:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Bruker:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Passord:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Lenke til mål-VSS-prosjekt" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "For alle elementer" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Sjekk ut" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Lagre som..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Versjonsstyringssystem" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Versjonsstyringssystem" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sti til cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Generelt" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatisk &rulling til første forskjell" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Fjern oppstartsbilde" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "L&ukk vinduer med ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifiser stier automatisk i Åpne-dialoger" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Nullstill" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Språk" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Tilgjengelige språk:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Søk" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "F&inn hva:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Sammenlign bare &hele ord" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Sammenlign store/små &bokstaver" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "Regulært &uttrykk" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Retning" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Opp" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "&Ned" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Finn neste" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Erstatt" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Ers&tatt med:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "&Ikke bryt enden av filen" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Erstatt i" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Valgte" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "He&le filen" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Erstatt" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Erstatt &alt" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Linjefilter" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulære uttrykk (ett pr linje):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Farger" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Forskjeller:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Valgte forskjeller:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Bakgrunn" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Slettet" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Ignorerte forskjeller:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Flyttet:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Valgt flyttet:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Ordforskjell:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Valgt ordforskjell:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Standardverdier" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Send slettede filer til søppelbøtten" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Legg til utforsker sin kontekstmeny" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "&Aktiver avansert meny" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Ekstern editor:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Rettelsegenerator" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Fil&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Fil&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "B&la gjennom..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "B&ytt" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "&Legg til i eksisterende fil" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "St&il:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Kontekst:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "&Mellomrom" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "Sammen&lign" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "I&gnorer endringer" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Ig&norer alt" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&er tomme linjer" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Skill mellom små &og store bokstaver" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Inklud&er kommandolinje" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Åpne i e&kstern editor" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Visningskolonner" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Velg utpakker" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Filutpakker:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Vis alle utpakkere, ikke kontroller filtype" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Filetypeliste:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Beskrivelse:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Stopp" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Gå til" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "G&å til:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Gå til hva" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "Li&nje" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Forskjell" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Gå til" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Sammenlign" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Mellomrom" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "Sammenlign &mellomrom" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "Ignorer e&ndringer av mellomrom" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Ignorer &alle mellomrom" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer blan&ke linjer" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignorer store/små &bokstaver" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Igno&rer forskjell i linjeskift (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "&Aktiver flyttet blokk-oppdagelse" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "&Filsammenligningsmetode:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Uthev syntaksen" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &oppdatering" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "&Bevar original EOL-tegn" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulator" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Tabulatorstørrelse:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "Sett inn tabulatorer" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Sett inn mellomrom" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filfilter" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Rediger..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Slett..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Lagre endrede filer?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Fil på venstre side" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Lagre endringer" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Kast endringer" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Fil på høyre side" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "L&agre endringer" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Ka&st endringer" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Tegntabell" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2005,596 +2012,596 @@ msgstr "" "Detekter tegntabellinformasjon for disse filene : .html, .rc, .xml \n" "Må starte programmet på nytt." -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "System tegntabell" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "I følge WinMerge brukergrensesnitt" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Tilpasset tegntabell:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - arkivstøtte er ikke aktivert" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" "(You can always recall this message from help menu.)" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Innstillinger" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Forskjellig" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identiske" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Avbryt" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041404e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Hans Fredrik Nordhaug" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x414, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2603,7 +2610,7 @@ msgstr "" "Opprett et tomt dokument\n" "Nytt dokument (Ctrl-N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2612,7 +2619,7 @@ msgstr "" "Åpne et eksisterende dokumentet\n" "Åpne (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2621,7 +2628,7 @@ msgstr "" "Lukk det aktive dokumentet\n" "Lukk" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2630,7 +2637,7 @@ msgstr "" "Lagre det aktive dokumentet\n" "Lagre (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2639,7 +2646,7 @@ msgstr "" "Lagre det aktive dokumentet med et nytt navn\n" "Lagre som" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2648,7 +2655,7 @@ msgstr "" "Endrer skriverens indstillinger\n" "Sideoppsett" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2657,7 +2664,7 @@ msgstr "" "Endrer skriver og skriverens indstillinger\n" "Skriveroppsett" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2666,7 +2673,7 @@ msgstr "" "Skriv ut det aktive dokumentet\n" "Skriv ut" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2675,12 +2682,12 @@ msgstr "" "Vis de fulle sidene\n" "Utskriftsforhåndsvisning" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2689,39 +2696,39 @@ msgstr "" "Åpne prosjektfil\n" "Project file (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2730,7 +2737,7 @@ msgstr "" "Vis programinformasjon, versjonsnummer og opphavsrett\n" "Om" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2739,9 +2746,6 @@ msgstr "" "Avslutt programmet; spør om man vil lagre dokumenter\n" "Avslutt" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2755,11 +2759,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Åpne dette dokumentet" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2768,7 +2775,7 @@ msgstr "" "Skift til det neste vinduet\n" "Neste vindu" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2777,7 +2784,7 @@ msgstr "" "Skift til det forrige vinduet\n" "Forrige vindu" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2786,7 +2793,7 @@ msgstr "" "Åpne et nytt vindu til det aktive dokumentet\n" "Nytt vindu" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2795,7 +2802,7 @@ msgstr "" "Arranger ikonene i bunnen av vinduet\n" "Arranger ikoner" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2804,7 +2811,7 @@ msgstr "" "Arranger vinduene så de overlapper\n" "Kaskade vinduer" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2813,7 +2820,7 @@ msgstr "" "Arranger vinduene som ikke-overlappende brikker\n" "Brikker vinduer" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2822,7 +2829,7 @@ msgstr "" "Arranger vinduene som ikke-overlappende brikker\n" "Brikker vinduer" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2831,7 +2838,7 @@ msgstr "" "Del det aktive vinduet\n" "Del" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2840,7 +2847,7 @@ msgstr "" "Slett det valgte\n" "Slett" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2849,7 +2856,7 @@ msgstr "" "Slett alt\n" "Slett alt" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2858,7 +2865,7 @@ msgstr "" "Kopier det valgte og sett det i utklippsbeholderen\n" "Kopier" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2867,7 +2874,7 @@ msgstr "" "Klipp det valgte ut og sett det i utklippsbeholderen\n" "Klipp" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2876,7 +2883,7 @@ msgstr "" "Finn den angitte teksten\n" "Finn" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2885,7 +2892,7 @@ msgstr "" "Sett inn utklippsbeholderens innhold\n" "Sett inn" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2894,7 +2901,7 @@ msgstr "" "Gjenta den siste handlingen\n" "Gjenta" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2903,7 +2910,7 @@ msgstr "" "Erstatt den angitte teksten med en annen tekst\n" "Erstatt" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2912,7 +2919,7 @@ msgstr "" "Velg hele dokumentet\n" "Velg alt" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2921,7 +2928,7 @@ msgstr "" "Angre den siste handlingen\n" "Angre" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2930,7 +2937,7 @@ msgstr "" "Gjenopprett den forrige handlingen\n" "Gjenopprett" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2939,7 +2946,7 @@ msgstr "" "Vis eller skjul verktøylinjen\n" "Vis verktøylinjen" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2948,69 +2955,69 @@ msgstr "" "Vis eller skjul statuslinjen\n" "Vis statuslinjen" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Endre vindusstørrelse" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Endre vindusposisjon" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Minimer vinduet til et ikon" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Maximer vinduet til full størrelse" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Skift til det neste dokumentvinduet" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Skift til det forrige dokumentvinduet" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Lukk det aktive vinduet og spør om dokumenter skal lagres" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Gjenopprett vinduet til normal størrelse" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Liste med aktive vinduer" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Aktiver dette vinduet" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3019,7 +3026,7 @@ msgstr "" "Lukk utskriftsforhåndsvisning\n" "Avbryt forhåndsvisning" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3031,175 +3038,175 @@ msgid "" "WinMerge Document" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Bevar originale EOL-tegn" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Trykk hvilken som helst knapp" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Høyreklikk på stien for å kopiere" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Prøv igjen" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Ignorer &alt" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Ja til &alt" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Nei" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Nei til a<" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Fortsett" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Hopp over" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Hopp over &alt" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Ikke hvis denne &meldingen igjen." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Ikke still dette &spørsmålet igjen." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Versjon %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Innstillinger (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle beskjedbokser vises nå igjen." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Det er gjort endringer i noen innstillinger, som kan ha innflytelse på allerede åpne vinduer. Noen av disse innstillinger virker muligens ikke før vinduene er gjenåpnet." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Den valgte endring av skrifttype vil ikke kunne ses i allerede åpne vinduer." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3207,7 +3214,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3215,107 +3222,107 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Åpne" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge prosjektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1950 +#: Merge.rc:1953 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Fullt innhold" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Raskt innhold" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Endringsdato" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Navn" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Plassering" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Beskrivelse" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Velg navn for nytt filter" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfiltere (*.flt)|*.flt|Alle filer (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3324,7 +3331,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3333,7 +3340,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3341,7 +3348,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3350,12 +3357,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3363,208 +3370,208 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Sti til cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Sti til SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Resultat av sammenligning av mapper" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Filsammenligning" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Venstre uten tittel" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Høyre uten tittel" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Skanner filer..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Åpner valgte" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Kopierer venstre til høyre" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Kopierer høyre til venstre" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Kopierer alt til venstre" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Kopierer alt til høyre" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Kopierer filer..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Sletter filer..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Flytter filer..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ln: %s Kol: %d/%d Tegn: %d/%d EOL: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Kol: %d/%d Tegn: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Flette" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Forskjell %1 av %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 forskjeller funnet" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 forskjell funnet" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Velg to eksisterende mapper eller filer for å sammenligne" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Mappe valg" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Velg to mapper eller filer for sammenligning." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Venstre sti er ugyldig!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Høyre sti er ugyldig!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Begge stier er ugyldig!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Velg to filer for aktivere utpakkervalg." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne fil og mappe!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Fil ikke funnet: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke pakket ut: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3577,7 +3584,7 @@ msgstr "" "\n" "er identiske binære filer." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3590,7 +3597,7 @@ msgstr "" "\n" "er forskjellige binære filer." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3601,7 +3608,7 @@ msgstr "" "\n" "er binær fil. Kan ikke sammenligne binær og tekstfil." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3614,37 +3621,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Lagre som" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Lagre endringer til %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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 markert som skrivebeskyttet. Vil du lagre filen under et annet navn?" -#: Merge.rc:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Sjekk skrivebeskyttelsen på destinasjonen" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Feil under backup av filen" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3653,7 +3660,7 @@ msgid "" "Continue anyway?" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3664,7 +3671,7 @@ msgid "" "\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3679,7 +3686,7 @@ msgstr "" "\n" "Vil du lagre den upakkede versjonen fil en annen fil?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3694,7 +3701,7 @@ msgstr "" "\n" "Vil du lagre den upakkede versjonen fil en annen fil?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3709,7 +3716,7 @@ msgstr "" "\n" "Skriv over endret fil?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3718,7 +3725,7 @@ msgstr "" "%1\n" "er markert skrivebeskyttet. Vil du overstyre det skrivebeskyttede elementet?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3733,17 +3740,17 @@ msgstr "" "\n" "Hvis du vil oppdatere lukk gjeldende filsammenligning og last inn filene på nytt." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Lagre venstre fil som" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Lagre høyre fil som" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3751,42 +3758,42 @@ msgid "" "Refresh documents before continuing." msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Du skal angi en SourceSafe prosjektsti for å fortsette (ie: $/MittProjekt)" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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 filen ut. Kan ikke fortsette..." -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Feil under utførelse av versjonsstyringssystemkommando." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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. Fortsett?" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) funnet!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Feil fra VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3794,186 +3801,186 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2114 #, 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Ingen" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (eldre enn 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 og nyere)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Slett valgte elementer til venstre" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Slett valgte elementer til høyre" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Slett de valgte element(er) på begge sider" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Skjul valgte element(er) (i farta filter)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Høyre til venstre (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Venstre til høyre (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Høyre til venstre (%1 av %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Venstre til høyre (%1 av %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Høyre til... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Venstre til... (%1 av %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Høyre til... (%1 av %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Høyre (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Venstre (%1 av %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Høyre (%1 av %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Begge (%1 av %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Velg målmappe" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Er du sikker på du vil kopiere alle forskjeller til den venstre filen?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Er du sikker på du vil kopiere alle forskjeller til den høyre filen?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -3988,17 +3995,17 @@ msgstr "" "til\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Er du sikker på du vil kopiere %1 av %2 valgte?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Er du sikker på at du vil slette %1 av %2 valgte element(er)?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4009,7 +4016,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4020,17 +4027,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4042,505 +4049,505 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Åpne venstre fil" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Åpne venstre fil i ekstern editor" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Åpne venstre fil med ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Åpne høyre fil" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Åpne høyre fil i ekstern editor" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Åpne høyre fil med ..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopier filnavn til utklippstavle " -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopier stinavn på venstre side til utklippstavle" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopier stinavn på høyreside til utklippstavle" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopier stinavn på begge sider til utklippstavle" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Ukjent arkivformat" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Legg til element fra venstre side til arkiv" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Legg til element fra høyre side til arkiv" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Legg til element fra begge sider til arkiv" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Legg til forskjellige elementer til arkiv (begge sider)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Flytt valgte filer på venstre side til tilpasset mappe" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Flytt valgte filer på høyre side til tilpasset mappe" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Mappe" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Resultat av sammenligningen" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Høyre dato" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Filtype" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Venstre størrelse" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Høyre størrelse" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Venstre opprettelsestid" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Høyre opprettelsestid" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Nyere fil" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Venstre filversjon" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Høyre filversjon" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Høyre attributter" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Venstre koding" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Høyre koding" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binær" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Fil hoppet over" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Mappe hoppet over" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Binære filer er identiske" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Binære filer er forskjellige" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Filer er forskjellige" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Bare venstre" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Bare høyre" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Forløpt tid: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 element valgt" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 elementer valgt" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Fil elle mappe navn." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkludert." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Sammenligningsresultat, lang form." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Venstre side endringsdato." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Høyre side endringsdato." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Filtype." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstørrelse i byte." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Høyre filstørrelse i byte." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Venstre side opprettelsestid." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Høyre side opprettelsestid." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Forteller hvilken side som sist ble endret." -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversjon, bare for noen filtyper." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Høyre side filversjon, bare for noen filetyper." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Kort sammenligningsresultat." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Høyre side attributter." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Venstre side koding." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Høyre side koding." -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Viser asterisk (*) hvis filen er binær." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Sammenligning %1 med %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Samme filen er åpen i begge panel." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "De valgte filene er identiske." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Det skjedde en feil under sammenligning av filene." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Binære filer kan ikke sammenlignes visuelt." -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Midlertidige filer kan ikke opprettes. Sjekk sti til den TMP/TEMP-mappe." -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Mapper kan ikke sammenlignes visuelt." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4555,7 +4562,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4566,22 +4573,22 @@ msgstr "" " Med gjeldende innstillinger vil de bli endret til hovedtypen.\n" " Vil du endre innstillingene og bevare de forskjellig linjeskiftene?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "En feil oppstod under forhåndsforskjell for filen '%1' med programtillegget '%2'. Forhåndsforskjellen blir ikke brukt mer." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4592,132 +4599,132 @@ msgstr "" "Visning av filene i hvert sin tegntabell ser best ut, men fletting/flytting er farlig.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Ingen forskjell" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Linjeforskjell" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(er)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finne strengen \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Kopier full sti" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Kopier filnavn" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Fil med rettelser vellykket skrevet." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element ikke funnet eller er mappe!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element ikke funnet eller er mappe!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Rettelsesfilen eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke opprette en fil med rettelser for binære filer." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke opprette en fil med rettelser for mapper." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4725,17 +4732,17 @@ msgid "" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Gjeldende resultat for mappesammenligning vil bli slettet." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4746,51 +4753,51 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4798,1117 +4805,1117 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Feil i regulært uttrykk" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Ingen treff" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Ugyldig regulært uttrykk" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Ugyldig collation tegn" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Ugyldig tegnklassenavn" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Etterfølgende omvendt skråstrek" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Ugyldig tilbakereferanse" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Ubalansert [ eller [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Ubalansert ( eller \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Ubalansert \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Ugyldig i innhold i \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Ugyldig område slutt" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Tom for minne" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Ugyldig foregående regulært uttrykk" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Fortidlig slutt på regulært uttrykk" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "For stort regulært uttrykk" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Ubalansert ) eller \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norwegian (Bokmål)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Lagre venstre fil" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Lagre høyre fil" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Lagre venstre fil med navn..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Lagre høyre fil med navn..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Endre venstre fil/mappe skrivebeskyttelsestatus" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Endre høyre fil/mappe skrivebeskyttelsestatus" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Omdanne EOL til DOS-modus" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Omdanne EOL til UNIX-modus" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Omdanne EOL til MAC-modus" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Veksle mellom redigerings- og flettemodus" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5917,7 +5924,7 @@ msgstr "" "Gå til linje eller forskjell\n" "Gå til (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5926,7 +5933,7 @@ msgstr "" "Sett programinnstillinger\n" "Innstillinger" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -5935,79 +5942,79 @@ msgstr "" "Oppdater visning\n" "Oppdater (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopier valgte linjer til utklippstavle med linjenummer foran" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6016,7 +6023,7 @@ msgstr "" "Velg skrifttype for visningen\n" "Velg skrifttype" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6025,27 +6032,27 @@ msgstr "" "Bruk standard skrifttype for visningen\n" "Standard skrifttype" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Viser et tegn for mellomrom" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Veksle forskjellsvindu" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Plasseringsvindu viser oversiktbilde av filene" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6054,7 +6061,7 @@ msgstr "" "Velg språk til brukergrensesnittet\n" "Språk" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6063,43 +6070,43 @@ msgstr "" "Vis forskjeller på en linje med forskjellig farge\n" "Vis linjeforskjell" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6108,7 +6115,7 @@ msgstr "" "Rull til den forrige forskjellen\n" "Forrige forskjell (Alt Opp)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6117,7 +6124,7 @@ msgstr "" "Rull til den neste forskjellen\n" "Neste forskjell (Alt Ned)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6126,7 +6133,7 @@ msgstr "" "Rull til den første forskjellen\n" "Første forskjell (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6135,7 +6142,7 @@ msgstr "" "Rull til den aktuelle forskjellen\n" "Aktuell forskjell (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6144,7 +6151,7 @@ msgstr "" "Rull til den siste forskjellen\n" "Siste forskjell (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6153,7 +6160,7 @@ msgstr "" "Kopier den valgte teksten til den høyre filen\n" "Kopier høyre (Alt Høyre)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6162,7 +6169,7 @@ msgstr "" "Kopier den valgte teksten til den venstre filen\n" "Kopier venstre (Alt Venstre)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6171,7 +6178,7 @@ msgstr "" "Kopier forskjell til høyre og gå videre til neste\n" "Kopier høyre og gå videre (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6180,7 +6187,7 @@ msgstr "" "Kopier forskjell til høyre og gå videre til neste\n" "Kopier venstre og gå videre (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6189,7 +6196,7 @@ msgstr "" "Kopier alle forskjeller til den høyre filen\n" "Alt til høyre" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6198,72 +6205,72 @@ msgstr "" "Kopier alle forskjeller til den venstre filen\n" "Alt til venstre" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Velg og endre rekkefølge for kolonner for mappesammenligning" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Generer en fil med rettelser" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Velg og endre filter" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Brukeren velger utpakker (ingen utpakker ved sammenligning av mapper)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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 (en filtype må kunne bestemmes)" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Velg en utpakker for denne filen" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Ingen forhåndforskjellviser (normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Foreslåtte programtillegg" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Andre programtillegg" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Fjern og laste på nytt alle programtillegg (for utviklere)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6272,12 +6279,12 @@ msgstr "" "Aktiverer neste fil synlig\n" "Aktiverer neste fil" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6286,296 +6293,301 @@ msgstr "" "Vis hjelpen for WinMerge\n" "Hjelp" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Skriver gjeldende versjon av WinMerge og konfigurasjon til en tekstfil" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Vis GNU general public license" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Kompilert privat: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" "Help Index" msgstr "" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" "Help Search" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Instillinger for programtillegg" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Ingen forhåndsforskjell" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Forhåndsforskjell hvis mulig" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke funnet - .sct skript ikke aktivert" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Ikke vis flyttede blokker" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Vis alle flyttede blokker" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Vis flyttede blokker bare fra gjeldende forskjell" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Gå til forskjell under markør" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G&å til forskjell %1 av %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "G&å til linje %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Polish.po b/Src/Languages/Polish.po index 111387485..a8966dace 100644 --- a/Src/Languages/Polish.po +++ b/Src/Languages/Polish.po @@ -71,7 +71,7 @@ msgstr "&Wytnij" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Kopiuj" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "Wk&lej" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&PrzejdŸ do" @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "&Otwórz" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "w za&rejestrowanej aplikacji" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "w &zewnêtrznym edytorze" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&w..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Plik" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Nowy\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Porównaj...\tCtrl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Otwórz projekt ...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Zapi&sz projekt..." @@ -158,1845 +158,1852 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "Zakoñcz" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Edycja" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Opcje..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Widok" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Zmi&eñ czcionkê..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Czcionka &domyœlna" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "Pasek s&tanu" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Jêzyk..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Narzêdzia" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtry..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Generuj patch..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Wtyczki" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "Rozpakuj &rêcznie" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "Rozpakuj &automatycznie" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Edytuj w programie rozpakowuj¹cym" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Prze³aduj wtyczki" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "Za³a&duj ustawienia..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "Ze&ruj opcje" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Okno" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Zamknij" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Zamknij &wszystkie" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Prze³¹cz &panel\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "P&oziomo" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "P&ionowo" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Kaskadowo" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Pomoc" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Spis treœci...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Indeks..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Szukaj..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "Ko&nfiguracja..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Obs³uga ar&chiwów wy³¹czona..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "Licencja GNU..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&O programie..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Otwórz projekt ...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Lewa tylko &odczyt" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Prawa t&ylko odczyt" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "&Kodowanie pliku" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Wybierz &wszystkie\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Poka¿ &identyczne archiwa" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Poka¿ &ró¿ne archiwa" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Poka¿ &unikatowe dla lewej" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Poka¿ u&nikatowe dla prawej" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Poka¿ po&miniête" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Poka¿ pliki &binarne" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Poka¿ elementy u&kryte" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Statystyki po&równania" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "O&dœwie¿\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Odœwie¿ zaznaczone\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Scal" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "&Porównaj\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nastêpna ró¿nica\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Pop&rzednia ró¿nica\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "P&ierwsza ró¿nica\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Bie¿¹ca ró¿nica\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Os&tatnia ró¿nica\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiuj na praw¹\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiuj na lew¹\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Usuñ\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Dostosuj kolumny..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Utwórz &raport..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Zachowaj\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Zachowaj &lew¹" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Zachowaj" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Zachowaj &jako..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Zachowaj &praw¹" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Drukuj..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "Drukuj &Podgl¹d" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Konwertuj koñce linii do" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "&Tryb scalania\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Cofnij\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Powtórz\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Wytnij\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopiuj\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "Wk&lej\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Zaznacz &ró¿nicê linii\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "W&yszukaj...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Zast¹p...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Skrypty" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Pusty >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Zaawansowane" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopuj z numerami wierszy\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "Za&k³adki" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Dodaj zak³adkê\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nastêpna zak³adka\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Poprzednia zak³adka\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Wyczyœæ wszystkie zak³adki" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&IdŸ do...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "&Poka¿ bia³e znaki" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Poka¿ ró¿nice &linii" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Poka¿ &numery linii" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Poka¿ &marginesy" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "Za&wijaj linie" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "Za&mieñ panele" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Panel &ró¿nic" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Panel &lokalizacji" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopiuj na prawo i przejdŸ dalej\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiuj na lewo i przejdŸ dalej\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Kopiuj wszystko na praw¹" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Kopiuj wszystko na lew¹" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Ró¿nicowanie wstêpne" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "&Porównaj" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&Lewa na praw¹" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "L&ewa do..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "&Prawa na lew¹" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "Pra&wa do..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "Prze&nieœ" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Lewa do..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&Prawa do..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Usuñ" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Lewa" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Prawa" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Obie" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "Zmieñ &nazwê" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "U&kryj elementy" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "O&twórz lew¹" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Otwórz p&raw¹" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiuj œ&cie¿ki" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Lewa (%1 z %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Prawa (%1 z %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Obie (%1 z %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Kopiuj &nazwy plików" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Lewa... (%1 z %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Prawa... (%1 z %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Obie... (%1 z %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Ró¿nice... (%1 z %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "O&dœwie¿" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "Kopiuj &pe³n¹ œcie¿kê" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Kopiuj nazwê p&liku" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Ustawienia wstêpnego ró¿nicowania" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Bez ró¿nicowania wstêpnego" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Automatyczne ró¿nicowanie wstêpne" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "IdŸ &do ró¿nicy" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "Bez &przeniesionych bloków" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "W&szystkie przeniesione bloki" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Przeniesiony blok dla bie¿¹cej ró¿nicy" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "O programie WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(kompilacja prywatna)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Wszelkie prawa zastrze¿one." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Zajrzyj na stronê WinMerge!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "Porównaj" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Wspó³twórcy" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Wybierz pliki lub katalogi..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Lewa:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Szukaj..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Prawa:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "S&zukaj..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Filtr:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Wybierz..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "Program &rozpakowuj¹cy:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "&Wybierz..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Uwzglêdnij podkatalogi" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Anuluj" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Pomoc" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Obiekty do porównania" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Baza danych:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "U¿ytkownik:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Has³o:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "£¹cze do projektu VSS" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Zastosuj do wszystkich" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "SprawdŸ" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Zapisz jako..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "System œledzenia wersji" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "Œledzenie &wersji:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "S&cie¿ka cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Ogólne" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "PrzejdŸ automatycznie do pierwszej ró¿nicy" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Wy³¹cz ekran powitalny" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zam&knij okna klawiszem ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automatycznie weryfikuj œcie¿ki w oknie Otwórz" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "Zezwól na uruchomienie tylko &jednej instancji programu" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Otwórz okno autouzupe³niania:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "W³¹cz wiele okien porównania dla" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Porównania &folderów" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Porównania &plików" -#: Merge.rc:768 +#: Merge.rc:771 #, 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, aby wyœwietlaæ wszystkie komunikaty." -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Resetuj" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Jêzyk" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Dostêpne jêzyki:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Wyszukaj" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Szukaj:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Dopasuj &ca³e s³owa" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Wielkoœæ &liter" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "Wyra¿enie ®ularne" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "Nie zawijaj k&oñca linii" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Kierunek" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "Do &góry" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "&W dól" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Nastêpny" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Zast¹p" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Z&ast¹p:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "&Nie zawijaj koñca pliku" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Zast¹p w" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Selekcja" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "Ca³y &plik" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Zast¹p" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "&Wszystkie" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Racjonalne dopasowanie wielkoœci" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "SprawdŸ" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Komentarze" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn po CheckOut" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Filtry wierszy" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Wyra¿enia regularne (jedno/wiersz):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Kolory" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Ró¿nica:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Wybrana ró¿nica:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "T³o" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Usuniête" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Pominiêta ró¿nica:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Przeniesione:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Wybrane przeniesiono:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Ró¿nica-s³owo:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Wybrana ró¿nica-s³owo:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Domyœlne" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Okno dialogowe" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Wyœlij usuniête pliki do &kosza" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignoruj ró¿nice czasu mniejsze ni¿ 3 sekundy" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integracja" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Dodaj do menu kontekstowego eksploratora" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "W³¹cz menu &zaawansowane" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "Domyœ&lnie uwzglêdnij podkatalogi" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "Zewnêtrzny &edytor:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "&Filtruj folder:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Przegl¹daj..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Generuj patch" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Plik&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Plik&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Prz&egl¹daj..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "Za&mieñ" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "Dodaj do &istniej¹cego pliku" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Wynik:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "St&yl:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Kontekst:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Bia³e &znaki" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "Porów&naj" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Po&miñ zmiany" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Pomiñ &wszystkie" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Pomiñ &bia³e znaki" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Uwzglêdnij wielkoœæ &liter" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Uwzglêdnij wiersz &poleceñ" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Otwórz w &zewnêtrznym edytorze" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Wyœwietl kolumny" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Wybierz program rozpakowuj¹cy" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Program rozpakowuj¹cy:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Poka¿ wszystkie programy, nie sprawdzaj rozszerzenia" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Lista rozszerzeñ:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Opis:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr " Postêp porównania folderów" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Porównywanie elementów..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Elementy porównane:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Wszystkich:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "IdŸ do" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "&IdŸ do:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Plik" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Element docelowy" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "&Wiersz" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Ró¿nica" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&IdŸ do" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Porównaj" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Bia³e znaki" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "Porównaj &bia³e znaki" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "P&omiñ zmiany bia³ych" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Pomiñ wszystkie bia³e" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignoruj ró¿nice pustych linii" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignoruj ró¿nice wielkoœci liter" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Pomiñ ró¿nice znaku &koñca wiersza (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "W³¹cz &wykrywanie przeniesionych bloków" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "&Metoda porównania plików:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "&Zatrzymaj po pierwszej ró¿nicy" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Komentarze filtra" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Edytor" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Podœwietlaj sk³adniê" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Automatyczny &rescan" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "Zachowaj &oryginalne znaki koñca linii" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulatory" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Wielkoœæ:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "Wstaw tabulatory" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Wstaw spacje" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Kolorowanie ró¿nic linii" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Poka¿ ró¿nice linii" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "Poziom &znaków" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "Poziom &s³ów:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filtry plików" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Instaluj..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Nowy..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Edycja..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Usuñ..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Zachowaj zmodyfikowane pliki?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Plik z lewej" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Zachowaj zmiany" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Odrzuæ zmiany" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Plik z prawej" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "Zachowa&j zmiany" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Odr&zuæ zmiany" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Odrzuæ wszystkie" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Strona kodowa" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Kodowanie domyœlne" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Wybierz domyœlne kodowanie dla otwieranych plików nie-Unicode:" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2005,32 +2012,32 @@ msgstr "" "Wykrywaj stronê kodow¹ dla tych plików : .html, .rc, .xml \n" "wymaga restartu" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Strona kodowa systemu" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Wed³ug interfejsu WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Str. kodowa u¿ytkownika:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge – Obs³uga archiwów wy³¹czona" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nie mo¿na wykryæ wersji 7-Zip (nie jest zainstalowany?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2039,12 +2046,12 @@ msgstr "" "Obs³uga archiwów wymaga programu 7-Zip w wersji 3.11 lub póŸniejszej lub skopiowania\n" "zasadniczych jego komponentów do katalogu programu." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "W tym katalogu musi siê znajdowaæ tak¿e odpowiednia wtyczka interfejsu (Merge7z*.dll)." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2053,12 +2060,12 @@ msgstr "" "Skorzystaj z zalecanej poni¿ej wersji 7-Zip, póki nie bêd¹ dostêpne wtyczki dla\n" "póŸniejszych wersji." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Wersja" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2067,54 +2074,54 @@ msgstr "" "Wymagana wtyczka\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Zalecana wersja 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "obecna" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Program 7-Zip zainstalowany w systemie:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "brak" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "brak" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Komponenty 7-Zip dla wersji autonomicznej:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "przestarza³a" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Wtyczki na œcie¿ce:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2123,486 +2130,486 @@ msgstr "" "Nie wyœwietlaj komunikatu ponownie.\n" "(Zawsze mo¿na w³¹czyæ pokazywanie w menu Pomoc.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Pobieranie wtyczek" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Opcje" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Kategorie" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "S³owa kluczowe:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Nazwy funkcji:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Komentarze:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Liczby:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operatory:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "S³owa:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "U¿ytkownika 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "U¿ytkownika 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Pogrubienie" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Raport porównania folderów" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "&Plik raportu:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Styl:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiuj do schowka" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Folder wspó³dzielony lub prywatny" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Jaki rodzaj filtra chcesz utworzyæ ?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtr wspó³dzielony (dla wszystkich u¿ytkowników)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtr prywatny (tylko dla bie¿¹cego u¿ytkownika)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Wsparcie dla archiwów" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Wsparcie archiwów wymaga zainstalowanej wtyczki 7-Zip:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Pobierz wtyczkê 7-zip" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&W³¹cz wsparcie dla archiwów" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&U¿yj stacjonarnego 7-Zip, jeœli dostêpny" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U¿y&j lokalnego 7-Zip z folderu WinMerge" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "Wy&krywaj typ archiwum z sygnatury pliku" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Statystyki porównania" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Foldery:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Pliki:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Ró¿nych" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Tekst:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binarne:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Unikalne" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Lewa:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Prawa:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identyczne" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Wszystkich:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Zamknij" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Dzia³anie" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Dzia³anie)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Wybierz stronê kodow¹ dla" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&£adowanie pliku:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "&Zapis pliku:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&U¿yj tej samej strony kodowej dla obu" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "Z&astosuj" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "A&nuluj" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Test filtra" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Testowanie filtra ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Podaj tekst do sprawdzenia:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "Nazwa &folderu" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Wynik:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Zamknij" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&U¿yj w³asnych kolorów tekstu" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Kolory tekstu u¿ytkownika" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Odstêp:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Czcionka regularna:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Zaznaczenie:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Œcie¿ki" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Ty&lko do odczytu" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Ty&lko do odczytu" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Otwórz..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Zapisz..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Pliki kopii" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Twórz kopie plików w:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Twórz pliki kopii w:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "Folder oryginalnego pliku" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "&Globalny folder dla kopii:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Nazwa pliku kopii:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "Dod&aj rozszerzenie .bak" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "Dodaj znacznik czasu" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041504e2" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "T³umaczenie: Mateo Gola" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x415, 1250" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Gotowe" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2611,7 +2618,7 @@ msgstr "" "Utwórz nowy dokument\n" "Nowy" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2620,7 +2627,7 @@ msgstr "" "Otwórz istniej¹cy dokument\n" "Otwórz (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2629,7 +2636,7 @@ msgstr "" "Zamknij aktywny dokument\n" "Zamknij" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2638,7 +2645,7 @@ msgstr "" "Zachowaj aktywny dokument\n" "Zachowaj (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2647,7 +2654,7 @@ msgstr "" "Zachowaj aktywny dokument pod inn¹ nazw¹\n" "Zachowaj jako" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2656,7 +2663,7 @@ msgstr "" "Zmieñ opcje wydruku\n" "Ustawienia strony" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2665,7 +2672,7 @@ msgstr "" "Zmieñ opcje drukarki i wydruku\n" "Ustawienia wydruku" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2674,7 +2681,7 @@ msgstr "" "Wydrukuj bie¿¹cy dokument\n" "Drukuj" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2683,12 +2690,12 @@ msgstr "" "Wyœwietl cale strony\n" "Podgl¹d wydruku" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Poka¿ wszystkie ukryte elementy" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2697,32 +2704,32 @@ msgstr "" "Otwórz plik projektu\n" "Plik projektu (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Nieznany b³¹d podczas otwierania projektu" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Nieznany b³¹d podczas zapisu projektu" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Plik projektu" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Plik projektu za³adowano pomyœlnie." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Plik projektu zapisano pomyœlnie." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2731,7 +2738,7 @@ msgstr "" "Zapisz aktualne œcie¿ki i opcje do pliku projektu\n" "Zapisz plik projektu" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2740,7 +2747,7 @@ msgstr "" "Wyœwietl informacje o programie, numer wersji i info o prawach autorskich\n" "O programie" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2749,9 +2756,6 @@ msgstr "" "WyjdŸ z programu; program pyta, czy zachowaæ dokumenty\n" "WyjdŸ" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2765,11 +2769,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Otwórz ten dokument" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2778,7 +2785,7 @@ msgstr "" "PrzejdŸ do nastêpnego panelu\n" "Nastêpny panel" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2787,7 +2794,7 @@ msgstr "" "Wróæ do poprzedniego panelu\n" "Poprzedni panel" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2796,7 +2803,7 @@ msgstr "" "Otwórz aktywny dokument w nowym oknie\n" "Nowe okno" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2805,7 +2812,7 @@ msgstr "" "Ustaw ikony u do³u okna\n" "Ustaw ikony" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2814,7 +2821,7 @@ msgstr "" "Ustaw okna w nak³adaj¹c¹ siê kaskadê\n" "Kaskadowo" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2823,7 +2830,7 @@ msgstr "" "Ustaw okna obok siebie\n" "Obok siebie" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2832,7 +2839,7 @@ msgstr "" "Ustaw okna obok siebie\n" "Obok siebie" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2841,7 +2848,7 @@ msgstr "" "Podziel aktywne okno na panele\n" "Podziel" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2850,7 +2857,7 @@ msgstr "" "Wyma¿ wybór\n" "Wyma¿" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2859,7 +2866,7 @@ msgstr "" "Wyma¿ wszystko\n" "Wyma¿ wszystko" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2868,7 +2875,7 @@ msgstr "" "Kopiuj selekcjê i wstaw do schowka\n" "Kopiuj" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2877,7 +2884,7 @@ msgstr "" "Wytnij selekcjê i wstaw do schowka\n" "Wytnij" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2886,7 +2893,7 @@ msgstr "" "ZnajdŸ wskazany tekst\n" "Wyszukaj" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2895,7 +2902,7 @@ msgstr "" "Wstaw zawartoœæ schowka\n" "Wklej" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2904,7 +2911,7 @@ msgstr "" "Powtórz ostatni¹ czynnoœæ\n" "Powtórz" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2913,7 +2920,7 @@ msgstr "" "Zast¹p dany tekst innym\n" "Zast¹p" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2922,7 +2929,7 @@ msgstr "" "Zaznacz ca³y dokument\n" "Zaznacz wszystko" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2931,7 +2938,7 @@ msgstr "" "Cofnij ostatni¹ czynnoœæ\n" "Cofnij" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2940,7 +2947,7 @@ msgstr "" "Powtórz cofniêt¹ czynnoœæ\n" "Powtórz" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2949,7 +2956,7 @@ msgstr "" "Poka¿ lub ukryj pasek narzêdzi\n" "Prze³¹cz pasek narzêdzi" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2958,69 +2965,69 @@ msgstr "" "Poka¿ lub ukryj pasek stanu\n" "Prze³¹cz pasek stanu" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Zmieñ rozmiar okna" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Zmieñ pozycjê okna" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Zredukuj okno do ikony" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Maksymalnie powiêksz okno" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Prze³¹cz na okno nastêpnego dokumentu" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Prze³¹cz na okno poprzedniego dokumentu" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zamknij aktywne okno; program pyta, czy zachowaæ dokumenty" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Przywróc normalny rozmiar okna" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "W³¹cz listê zadañ" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Aktywuj to okno" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3029,7 +3036,7 @@ msgstr "" "Zamknij podgl¹d wydruku\n" "Anuluj podgl¹d" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3048,23 +3055,23 @@ msgstr "" "WinMerge.Dokument\n" "Dokument WinMerge" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Zachowaj oryginalne znaki EOL" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Naciœnij dowolny klawisz" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Kliknij prawym klawiszem na œcie¿kê do skopiowania" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3073,152 +3080,152 @@ msgstr "" "Wspó³twórcy:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "Program WinMerge nie oferuje ¿adnej gwarancji u¿ytkowania. Jest to w pe³ni darmowa aplikacja i mo¿e ona byæ rozpowszechniana przy zachowaniu pewnych zasad; zobacz szczegó³y: GNU Public License w meny 'Pomoc'." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Przerwij" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "P&onów" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignoruj" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Ignoruj &wszystkie" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Tak" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Tak na &wszystkie" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Nie" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Nie na w&szystkie" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Kontynuuj" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "Pom&iñ" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Pomiñ ws&zystkie" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Nie wyœwietlaj ponownie tego komunikatu." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Nie &pytaj ponownie." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Kolory sk³adni" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Kolory tekstu" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Kontrola wersji" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Wersja %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Opcje (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Wszystkie komunikaty zostan¹ ponownie wyœwietlone." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Dokonano modyfikacji w pliku bie¿¹cej sesji porównywania. Niektóre ustawienia nie zostan¹ zastosowane przed ponownym uruchomieniem powrównywania." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Wybrana czcionka nie zostanie zastosowana do widocznych okien z ró¿nicami." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3229,7 +3236,7 @@ msgstr "" "\n" "Proszê u¿yæ wartoœci 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3240,107 +3247,107 @@ msgstr "" "\n" "Po wyzerowaniu konieczne bêdzie ponowne uruchomienie programu." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Otwórz" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Pliki projektów WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Pliki ustawieñ (*.ini)|*.ini|All Files (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Pliki HTML (*.htm,*.html)|*.htm;*.html|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Pliki XML (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Pe³na zawartoœæ" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Skrócona zawartoœæ" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Data modyfikacji" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Data modyfikacji i wielkoœæ" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Wielkoœæ" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Nazwa" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "lokalizacja" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtry" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Wybierz nazwê dla nowego filtra" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtry plików(*.flt)|*.flt|Wszystkie filtry (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3349,7 +3356,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3362,7 +3369,7 @@ msgstr "" "\n" "Upewnij siê, ¿e folder taki istnieje i jest zapisywalny." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3373,7 +3380,7 @@ msgstr "" "\n" "Proszê wybraæ folder filtrów w opcje/System." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3386,12 +3393,12 @@ msgstr "" "\n" "Byæ mo¿e plik ten jest tylko do odczytu?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Lokalizuj plik fitra do instalacji" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3402,208 +3409,208 @@ msgstr "" "\n" "Nie mo¿na skopiowaæ pliku do foldera filtrów." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Plik filtra ju¿ istnieje. Czy nadpisaæ istniej¹cy plik?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "Œ&cie¿ka do cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "Œc&ie¿ka do SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Wyniki porównania katalogów" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Porównywanie plików" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Lewy bez tytu³u" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Prawy bez tytu³u" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Skanowanie plików..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Otwieranie wybranych" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Kopiowanie lewej na praw¹" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Kopiowanie prawej na lew¹" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Kopiowanie wszystkich na lew¹" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Kopiowanie wszystkich na praw¹" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Kopiowanie plików..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Usuwanie plików..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Przenoszenie plików..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Tworzenie raportu..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Lin: %s Kol: %d/%d Zn: %d/%d EOL: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Linia: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Lin: %s Kol: %d/%d Zn: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Scal" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Ró¿nica %1 z %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "Znaleziono %1 ró¿nic" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "Znaleziono 1 ró¿nicê" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Element %1 z %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Elementy: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wybierz dwa istniej¹ce katalogi lub pliki do porównania" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Wybór katalogu" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Wybierz dwa katalogi lub pliki do porównania." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Lewa œcie¿ka nieprawid³owa!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Prawa œcie¿ka nieprawid³owa!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Obie œcie¿ki nieprawid³owe!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Wybierz dwa pliki, aby umo¿liwiæ wybór programu rozpakowuj¹cego." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Nie mo¿na porównaæ pliku i katalogu!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Nie znaleziono pliku: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Plik nie rozpakowany: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3616,7 +3623,7 @@ msgstr "" "\n" "to identyczne pliki binarne." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3629,7 +3636,7 @@ msgstr "" "\n" "to ró¿ne pliki binarne." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3640,7 +3647,7 @@ msgstr "" "\n" "to plik binarny. Nie mo¿na porównaæ binarnych i tekstowych." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3653,37 +3660,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Zachowaj jako" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Zachowaæ zmiany w %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "B³¹d sprawdzania mo¿liwoœci zapisu w miejscu docelowym" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "B³¹d przy tworzeniu kopii zapasowej pliku" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3696,7 +3703,7 @@ msgstr "" "\n" "Kontynuowaæ ?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3713,7 +3720,7 @@ msgstr "" "\t-u¿yæ innej nazwy pliku (wybierz Ok)\n" "\t-anulowaæ operacjê (wybierz Anuluj)?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3728,7 +3735,7 @@ msgstr "" "\n" "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3743,7 +3750,7 @@ msgstr "" "\n" "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3758,7 +3765,7 @@ msgstr "" "\n" "Nadpisaæ zmieniony plik?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3767,7 +3774,7 @@ msgstr "" "%1\n" "jest oznaczony jako tylko do odczytu. Czy zignorowaæ status tylko do odczytu?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3782,17 +3789,17 @@ msgstr "" "\n" "Jeœli chcesz odœwie¿yæ pliki, zamknij bie¿¹c¹ sesjê i za³aduj je ponownie." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Zachowaj lewy plik jako" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Zachowaj prawy plik jako" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3803,42 +3810,42 @@ msgstr "" "\n" "Przed kontynuacj¹ odœwie¿ dokumenty." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Pobie¿ pliki z VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "B³¹d wykonania polecenia systemu wersjonowania." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Nie znaleziono bazy VSS!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "B³¹d VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3849,7 +3856,7 @@ msgstr "" " Proszê sprawdziæ config_spec u¿ywanego widoku.\n" " Cofn¹æ operacjê checkout?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3858,179 +3865,179 @@ msgstr "" "System œledzenia wersji zwróci³ b³¹d podczas operacji uncheckout.\n" " Proszê sprawdziæ config_spec u¿ywanego widoku." -#: Merge.rc:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Brak" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "(Visual SourceSafe (poni¿ej 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i wy¿ej)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Zatrzymaj na przerwie" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Zatrzymaj na przerwie lub punktorze" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiuj wybrany plik do wskazanego katalogu" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiuj wybrany plik do katalogu" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Usuñ wybran¹ pozycjê z lewej" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Usuñ wybran¹ pozycjê z prawej" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Usuñ wybrane pozycje po obu stronach" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ukryj wybrane elementy (filtr roboczy)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Zmieñ nazwê wybranej pozycji na obu stronach" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Prawa na lew¹ (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Lewa na praw¹ (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Prawa na lew¹ (%1 z %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lewa na praw¹ (%1 z %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Lewa na... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Prawa na... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lewa na... (%1 z %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Prawa na... (%1 z %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Lewa (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Prawa (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Obie (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Lewa (%1 z %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Prawa (%1 z %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Obie (%1 z %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Wybierz katalog docelowy" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Lewa strona - wybierz folder docelowy:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Prawa strona - wybierz folder docelowy:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 objêtych plików)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 z %2 objêtych plików)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Czy rzeczywiœcie chcesz skopiowaæ wszystkie ró¿nice na plik po lewej?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Czy rzeczywiœcie chcesz skopiowaæ wszystkie ró¿nice na plik po prawej?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4045,17 +4052,17 @@ msgstr "" "na \n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Czy chcesz skopiowaæ%1 z %2 wybranych pozycji?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Czy rzeczywiœcie usun¹æ %1 z %2 wybranych pozycji?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4066,7 +4073,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4077,17 +4084,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4099,458 +4106,458 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Otwórz lewy plik" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Otwórz lewy plik w zewnêtrznym edytorze" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Otwórz lewy plik w..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Otwórz prawy plik" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Otwórz prawy plik w zewnêtrznym edytorze" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Otwórz prawy plik w..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nie mo¿na uruchomiæ zewnêtrznego edytora: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Nieznane rozszerzenie dla zewnêtrznego edytora: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiuj nazwy plików do schowka" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiuj œcie¿ki z lewej do schowka" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiuj œcie¿ki z prawej do schowka" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiuj œcie¿ki z obu stron do schowka" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Nieznany format archiwum" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Dodaj elementy z lewej do archiwum" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Dodaj elementy z prawej do archiwum" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Dodaj elementy z obu stron do archiwum" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Dodaj ró¿ne elementy do archiwum (z obu stron)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Kopiuj wybrany plik z lewej do katalogu" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Kopiuj wybrany plik z prawej do katalogu" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Plik" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Katalog" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Wynik porównania" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Lewa data" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Prawa data" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Rozszerzenie" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Lewy rozmiar" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Prawy rozmiar" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Prawy rozmiar (krótki)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Lewy rozmiar (krótki)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Lewy czas utworzenia" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Prawy czas utworzenia" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Nowszy plik" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Wersja lewego pliku" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Wersja prawego pliku" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Skrócony wynik" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Lewe atrybuty" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Prawe atrybuty" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Lewe EOL" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Prawe EOL" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Lewe kodowanie" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Prawe kodowanie" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Ignorowane ró¿n." -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Ró¿nice" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binarne" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Nie mo¿na porównaæ plików" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Anulowany" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Plik pominiêty" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Katalog pominiêty" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Pliki binarne s¹ identyczne" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Pliki binarne s¹ ró¿ne" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Pliki s¹ ró¿ne" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Tylko lewa" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Tylko prawa" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Up³ynê³o: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "wybrano 1 element" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "wybrano %1 elementów" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Plik lub katalog." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazwa podkatalogu, gdy podkatalogi s¹ przetwarzane." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Wynik porównania – wersja pe³na." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Data modyfikacji lewej strony." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Data modyfikacji prawej strony." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Rozszerzenie pliku." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Rozmiar lewego pliku w bajtach." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Rozmiar prawego pliku w bajtach." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Lewa wielkoœæ pliku skrócona." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Prawa wielkoœæ pliku skrócona." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Czas utworzenia lewej strony." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Czas utworzenia prawej strony." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Pokazuje, która strona zosta³a póŸniej zmodyfikowana." -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Wersja pliku z lewej - tylko dla niektórych typów." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Wersja pliku z prawej - tylko dla niektórych typów." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Skrócony wynik porównania." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Atrybuty lewej strony." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Atrybuty prawej strony." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Lewa strona pliku typu EOL" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Prawa strona pliku typu EOL" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Kodowanie lewej strony." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Kodowanie prawej strony." -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Pokazuje gwiazdkê (*) jeœli plik binarny." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Porównaj %1 z %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Lista z przecinkami" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Lista z tabulatorami" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "Prosty HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "Prosty XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4559,47 +4566,47 @@ msgstr "" "B³¹d przy tworzeniu raportu:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Raport zosta³ pomyœlnie utworzony." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Ten sam plik otwierany w obu panelach." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Wybrane pliki s¹ identyczne." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Wybrany folder istnieje tylko po przeciwnej stronie i dlatego nie mo¿e zostac otwarty." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "B³¹d podczas porównywania plików." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Pliki binarne nie mog¹ byæ porównywane wizualnie." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Nie mo¿na porównaæ wizualnie katalogów." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4614,7 +4621,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4625,22 +4632,22 @@ msgstr "" " Przy bie¿¹cych ustawieniach zostan¹ zunifikowane do g³ównego typu.\n" " Czy zmieniæ opcje i zachowaæ ró¿ne znaki EOL?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "B³¹d przy wstêpnym porównaniu pliku '%1' za pomoc¹ wtyczki '%2'. Wstêpne porównanie nie zostanie zastosowane." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Wybrany folder jest nieprawid³owy." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nie mo¿na otworzyæ w edytorze pliku binarnego." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4651,132 +4658,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Ostrze¿enie: Pliki u¿ywaj¹ ró¿nego kodowania, lewy=%s a prawy=%s, a ich po³¹czenie mo¿e spowodowaæ utratê informacji." -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Utrata informacji z powodu b³êdów kodowania: oba pliki" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Utrata informacji z powodu b³êdów kodowania: prawy plik" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Utrata informacji z powodu b³êdów kodowania: lewy plik" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Brak ró¿nic" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Wiersz ró¿nicy" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Zast¹piono %1 sekwencji znaków." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nie mo¿na znaleŸæ sekwencji znaków \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Kopiuj pe³n¹ œcie¿kê" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Kopiuj nazwê pliku" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Okno lokacji" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Okno Diff" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Utworzono patch." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element nie zosta³ znaleziony albo jest katalogiem!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element nie zosta³ znaleziony albo jest katalogiem!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Plik patch ju¿ istnieje. Czy napisaæ plik?" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[wybrano %1 plików]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Normalny" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Zunifikowany" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Nie mo¿na zapisaæ do pliku %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Wybrana œcie¿ka docelowa nie jest absolutna: %1" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Wybierz plik docelowy" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nie mo¿na utworzyæ patcha z plików binarnych." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nie mo¿na utworzyæ patcha z katalogów." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4787,17 +4794,17 @@ msgstr "" "\n" "Tworzenie patcha wymaga zapisania wszystkich zmian w plikach." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Folder nie istnieje." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Wyniki bie¿¹cego porównania katalogów zostan¹ usuniête." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4808,7 +4815,7 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4817,7 +4824,7 @@ msgstr "" "\n" "Uwaga: Integracja 7-Zip jest wy³¹czona w ustawieniach programu." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4826,37 +4833,37 @@ msgstr "" "\n" "Uwaga: Integracja 7-Zip ograniczona jest do podstawowych operacji w ustawieniach programu." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Wybierz plik do eksportu" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Wybierz plik do importu" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Zaimportowano opcje z pliku." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Wyeksportowano opcje do pliku." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "B³¹d podczas importu opcji z pliku." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "B³¹d podczas eksportu opcji do pliku." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4864,1098 +4871,1098 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "B³¹d w wyra¿eniu regularnych" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Brak trafienia" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Niepoprawne wyra¿enie regularne" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Niepoprawny znak kolacjonowania" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Niepoprawna nazwa klasy znaków" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Ukoœnik nastêpczy" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Niepoprawne odniesienie wsteczne" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Brakuj¹ce [ lub [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Brakuj¹ce ( lub \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Brakuj¹ce \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Niepoprawna zawartoœæ \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Niepoprawne zakoñczenie zakresu" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Brak pamiêci" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Niepoprawne poprzedzaj¹ce wyra¿enie regularne" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Przedwczesne zakoñczenie wyra¿enia regularnego" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Wyra¿enie regularne zbyt du¿e" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Brakuj¹ce ) lub \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Afrykanerski" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albañski" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabski (Arabia Saudyjska)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabski (Irak)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabski (Egipt)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabski (Libia)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabski (Algieria)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabski (Maroko)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabski (Tunezja)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabski (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabski (Jemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabski (Syria)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabski (Jordania)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabski (Liban)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabski (Kuwejt)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabski (ZEA)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabski (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabski (Katar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Ormiañski" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azeski (³aciñski)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azerski (cyrylica)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Baskijski" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Bia³oruski" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bu³garski" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Kataloñski" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chiñski (tradycyjny)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chiñski (uproszczony)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chiñski (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chiñski (Singapur)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chiñski (Makao)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Chorwacki" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Czeski" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Duñski" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Holenderski" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Holenderski (Belgia)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Angielski (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Angielski (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Angielski (Australia)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Angielski (Kanada)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Angielski (Nowa Zelandia)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Angielski (Irlandia)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Angielski (RPA) " -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Angielski (Jamajka)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Angielski (Karaiby)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Angielski (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Angielski (Trynidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Angielski (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Angielski (Filipiny)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Francuski" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Francuski (Belgia)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Francuski (Kanada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Francuski (Szwajcaria)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Francuski (Luksemburg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Francuski (Monako)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Gruziñski" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Niemiecki (Niemcy)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Niemiecki (Szwajcaria)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Niemiecki (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Niemiecki (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Niemiecki (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Grecki" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebrajski" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Wêgierski" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Islandzki" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonezyjski" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "W³oski" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "W³oski (Szwajcaria)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japoñski" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmiri (Indie)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Kazachski" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Koreañski" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Koreañski (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "£otweski" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Litewski" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malajski (Malezja)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malajski (Brunei)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norweski (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norweski (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugalski" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugalski (Brazylia)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Rumuñski" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Rosyjski" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sanskryt" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbski (³aciñski)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbski (cyrylica)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "S³owacki" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "S³oweñski" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Hiszpañski" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Hiszpañski (Meksyk)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Hiszpañski (wspó³czesny)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Hiszpañski (Gwatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Hiszpañski (Kostaryka)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Hiszpañski (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Hiszpañski (Dominikana)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Hiszpañski (Wenezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Hiszpañski (Kolumbia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Hiszpañski (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Hiszpañski (Argentyna)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Hiszpañski (Ekwador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Hiszpañski (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Hiszpañski (Urugwaj)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Hiszpañski (Paragwaj)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Hiszpañski (Boliwia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Hiszpañski (Salwador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Hiszpañski (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Hiszpañski (Nikaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Hiszpañski (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Suahili (Kenia)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Szwedzki" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Szwedzki (Finlandia)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tamilski" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatarski" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Tajski" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turecki" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ukraiñski" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (Indie)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbecki (³aciñski)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbecki (cyrylica)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Wietnamski" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Zachodnia Europa" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Wschodnia Europa" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Wschodnia Azja" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "Po³udniowa Azja" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Œrodkowy Wschód" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Nie stosuje siê" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrylica" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS £aciñski US" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabski" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grecki" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Kr.Ba³tyckie" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS £aciñski 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grecki 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS £aciñski 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrylica" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turecki" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugalski" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandzki" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrajski" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Francuski (Kanada)" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Skandynawski" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrylica CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grecki 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Tajski" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japoñski" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chiñski (uproszczony)" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Koreañski" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chiñski (tradycyjny)" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows £aciñski 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrylica (S³owiañskie)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows £aciñski 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Grecki" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows £aciñski 5 (Turecki)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrajski" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Arabski" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Kr.Ba³tyckie" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Wietnamski" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romañski" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grecki" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrylica" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europa Œrodkowa" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turecki" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Kodowanie ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Kodowanie ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Kodowanie ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Kodowanie ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Kodowanie ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Zachowaj lewy plik" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Zachowaj prawy plik" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Zachowaj lewy plik pod nazw¹..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Zachowaj prawy plik pod nazw¹..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Zmieñ status 'tylko odczyt' lewego pliku/katalogu" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Zmieñ status 'tylko odczyt' prawego pliku/katalogu" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Konwertuj znaki EOL do konwencji DOS" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Konwertuj znaki EOL do konwencji UNIX" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Konwertuj znaki EOL do konwencji MAC" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Prze³¹cz miêdzy trybami edycji i scalania" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5964,12 +5971,12 @@ msgstr "" "Poka¿ i dostosuj w³aœciwoœci kodowania pliku\n" "W³aœciwoœci kodowania pliku" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5978,7 +5985,7 @@ msgstr "" "Zaznacz obszar ró¿nicy w bie¿¹cej linii\n" "Ró¿nica w bie¿¹cej linii" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -5987,7 +5994,7 @@ msgstr "" "PrzejdŸ do linii lub ró¿nicy\n" "IdŸ do (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -5996,7 +6003,7 @@ msgstr "" "Ustaw opcje programu\n" "Opcje" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6005,79 +6012,79 @@ msgstr "" "Odœwie¿ podgl¹d\n" "Odœwie¿ (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiuj wybrane linie do schowka dodaj¹c numeracjê wierszy" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Odœwie¿ zaznaczone elementy" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Dodaj zak³adkê" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "IdŸ do nastêpnej zak³adki" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "IdŸ do poprzedniej zak³adki" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Wyczyœæ wszystkie zak³adki" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "Wyœwietla pliki, które s¹ dok³adnie identyczne" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "Wyswietla pliki z ró¿nicami" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "Wyswietla pliki istniej¹ce tylko po lewej" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "Wyswietla pliki istniej¹ce tylko po prawej" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "Wyœwietla pliki binarne" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "Wyœwietla pominiête pliki" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6086,7 +6093,7 @@ msgstr "" "Wybierz czcionkê podgl¹du\n" "Wybierz czcionkê podgl¹du" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6095,27 +6102,27 @@ msgstr "" "Przywróæ domyœln¹ czcionkê systemow¹ podgl¹du\n" "Czcionka domyœlna" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Pokazuje bia³e znaki" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Prze³¹cz panel ró¿nic" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Panel pokazuje ogólny obraz z plików" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Poka¿ okno statystyk porównania folderu" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6124,7 +6131,7 @@ msgstr "" "Wybierz jêzyk interfejsu u¿ytkownika\n" "Jêzyk" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6133,12 +6140,12 @@ msgstr "" "Poka¿ ró¿nice w liniach o ró¿nym kolorze\n" "Poka¿ ró¿ne linie" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Zamieñ pozycje dwóch okien" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6147,7 +6154,7 @@ msgstr "" "Poka¿ numery linii\n" "Poka¿ numery linii" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6156,7 +6163,7 @@ msgstr "" "W³¹cz zawijanie s³ów\n" "Zawijaj linie" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6165,17 +6172,17 @@ msgstr "" "Pokazuje marginesy zaznaczenie dla obu paneli\n" "Poka¿ marginesy zaznaczenia" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6184,7 +6191,7 @@ msgstr "" "Przewiñ do poprzedniej róznicy\n" "Poprz. Ró¿n. ( Alt Up )" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6193,7 +6200,7 @@ msgstr "" "Przewiñ do nastêpnej ró¿nicy\n" "Nast. ró¿n. (Alt Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6202,7 +6209,7 @@ msgstr "" "Przewiñ do pierwszej ró¿nicy\n" "Pierwsza (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6211,7 +6218,7 @@ msgstr "" "Przewiñ do bie¿¹cej ró¿nicy\n" "Bie¿¹ca (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6220,7 +6227,7 @@ msgstr "" "Przewiñ do ostatniej ró¿nicy\n" "Ostatnia (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6229,7 +6236,7 @@ msgstr "" "Kopiuj wybrany tekst do prawego pliku\n" "Kopiuj na prawo (Alt Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6238,7 +6245,7 @@ msgstr "" "Kopiuj wybrany tekst do lewego pliku\n" "Kopiuj na lewo (Alt Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6247,7 +6254,7 @@ msgstr "" "Kopiuj ró¿nicê na prawo i przejdŸ do nastêpnej\n" "Kopiuj na prawo i nastêpna (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6256,7 +6263,7 @@ msgstr "" "Kopiuj ró¿nicê na lewo i przejdŸ do nastêpnej\n" "Kopiuj na lewo i nastêpna (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6265,7 +6272,7 @@ msgstr "" "Kopiuj wszystkie ró¿nice do prawego pliku\n" "Wszystkie na prawo" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6274,72 +6281,72 @@ msgstr "" "Kopiuj wszystkie ró¿nice do lewego pliku\n" "Wszystkie na lewo" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Usuñ zaznaczone elementy z obu folderów" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Porównaj zaznaczony element Porównaj zaznaczony element (porównaj pierwszy element jeœli zaznaczono wiele elementów)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Wybierz i ponownie uporz¹dkuj kolumny porównania katalogów" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Generuj plik patch" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Wybierz i modyfikuj filtry" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Generuje raport z wyników porównania" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "U¿ytkownik wybiera program rozpakowuj¹cy (bez rozpakowywania podczas porównania katalogów)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Wybierz program rozpakowuj¹cy, by edytowaæ plik" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Bez ró¿nicowania wstêpnego (normalne)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Sugerowane wtyczki" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Inne wtyczki" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Od³¹cz i ponownie pod³¹cz wszystkie wtyczki (dla programistów)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6348,12 +6355,12 @@ msgstr "" "Aktywuje nastêpny widoczny plik\n" "Aktywuj nastêpny plik" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Zamyka wszystkie otwarte okna" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6362,22 +6369,22 @@ msgstr "" "Wyœwietla podrêcznik u¿ytkownika WinMerge\n" "Pomoc" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Wyœwietla bie¿¹c¹ wersjê WinMerge oraz tekstowy plik konfiguracji" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Wyswietl licencjê GNU" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Kompilacja prywatna: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6386,7 +6393,7 @@ msgstr "" "Otwórz spis tematów Pomocy WinMerge\n" "Indeks pomocy" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6395,267 +6402,272 @@ msgstr "" "Otwórz wyszukiwanie w Pomocy WinMerge\n" "Szukaj w Pomocy" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Ustawienia wtyczki" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Bez ró¿nicowania wstêpnego" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Ró¿nicuj wstêpnie, jeœli mo¿na" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Nie znaleziono WSH – skrypty .sct wy³¹czone" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Otwórz plik w zarejestrowanej aplikacji" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Otwórz plik w zewnêtrznym edytorze" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Otwórz plik w wybranym programie" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Nie wyœwietlaj przenoszonych bloków" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Wyœwietla wszystkie przeniesione bloki" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Wyœwietl przeniesione bloki tylko od bie¿¹cej ró¿nicy" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "IdŸ do ró¿nicy pod kursorem" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "IdŸ &do ró¿nicy %1 z %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "&IdŸ do linii %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Wy³¹czone" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Z systemu plików" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Z listy MRU" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Portuguese.po b/Src/Languages/Portuguese.po index b64c05412..9c9973602 100644 --- a/Src/Languages/Portuguese.po +++ b/Src/Languages/Portuguese.po @@ -71,7 +71,7 @@ msgstr "Cor&tar" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "Co&piar" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "Co&lar" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&Ir para..." @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "&Abrir" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "com a aplicação registada" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "com editor &externo" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "com..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Ficheiro" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Abrir projecto...\Ctrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "&Guardar projecto..." @@ -158,2528 +158,2532 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Sair" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Opções..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Ver" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Seleccionar &fonte..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Usar fonte pre&definida" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "&Barra de ferramentas" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "Barra de esta&do" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Idioma..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Ferramentas" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "Filtros..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Gerar ficheiro patch..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "Plugins" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "E&xtracção manual" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "Extracção automática" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "Editar com extractor" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Recarregar plugins" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "Dep&urar" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "Carregar configuração..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Janela" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Fechar" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Fechar &Todos" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Mudar &Vista\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Ordenar &horizontalmente" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Ordenar &verticalmente" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "Cascata" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "A&juda" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "Conteúdo...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Índice..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Busca..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "Con&figuração..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Suporte de ar&quivo desactivado..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "Licença pública &GNU..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "Acerca de &WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir pro&jecto...\Ctrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Ler apenas lado &esquerdo" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Ler apenas lado &direito" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "Codificação do ficheiro" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Seleccionar &tudo\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Mostrar itens idênticos" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Mostrar itens diferentes" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostrar itens únicos do lado esquerdo" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar itens únicos do lado direito" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Mostrar itens ignorados" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Mostrar ficheiros &binários" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar itens ocultados" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Comparar estatísticas" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "Actuali&zar\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualizar selecção\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "Combinar" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Comparar\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Próxima diferença\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferença anterior\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Primeira diferença\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferença actual\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Última diferença\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar para o lado direito\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar para o lado esquerdo\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Eliminar\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "Personalizar colunas..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "&Gerar relatório..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Guardar\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Guardar lado esquerdo" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Guardar" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Guardar como..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Guardar lado direito" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "Pré-&visualizar" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "Converter final de linhas para" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Modo Combinar\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfazer\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refazer\tCtrl+Z" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar...\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Colar\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleccionar diferenças de linha\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Procurar...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Substituir...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "Scripts" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Vazio >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Avançado" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Copiar com nºs de linha\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Marcadores" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Alternar marcadores\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "Próximo marcador\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Marcador anterior\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "Eliminar todos os marcadores" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Ir para...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Combinar" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "&Ver espaços" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Ver diferenças de linha" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Ver nºs de linha" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "Ajuste de linha" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "Trocar janelas" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Janela de diferenças" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Janela de localização" -#: Merge.rc:428 +#: Merge.rc:430 #, 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:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar para o lado esquerdo\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Copiar tudo para a direita" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "C&opiar tudo para a esquerda" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "Pré-diferenciar" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "Comparar" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "Da esquerda para a direita" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "Da esquerda para..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "Da direita para a esquerda" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "Da direita para..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "Mover" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "Da esquerda para..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "Da direita para..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "Eliminar" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "Esquerda" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "Direita" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "Ambos" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "Renomear" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "Ocultar itens" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "Abrir esquerda" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Abrir direita" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Copiar localização" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "Esquerda (%1 de 2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "Direito (%1 de 2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Co&piar localização" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "Esquerda... (%1 de %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "Direita... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "Ambos... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Diferenças... (%1 de %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "Actualizar" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "Copiar localização completa" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Co&piar nome de ficheiro" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Definições de Pré-diferenciação" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "Não pré-diferenciar" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Pré-diferenciação manual" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Ir para diferença" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "Não mostrar blocos movidos" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "Todos os blocos movidos" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Bloco movido para a diferença actual" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Acerca de WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Todos os direitos reservados." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visite o site de WinMerge!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Colaboradores" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Seleccione ficheiros ou arquivos" -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "Esquerda:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "Pesquisar..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "Direita:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "Pesquisar..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "Filtro:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Seleccionar..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "E&xtractor:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Seleccionar..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "Incluir sub-ficheiros" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Estado:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Ficheiros ou arquivos a comparar" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Base de dados:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Projecto:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Utilizador:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Palavra-passe:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Hiperligação ao destino do projecto VSS" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Guardar como..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Sistema de versão" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "Sistema de versão:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "Destino de cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Geral" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Ir automaticamente para a primeira diferença" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "Desactivar ecrã de apresentação" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fechar janela com ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verificar automaticamente localização na janela de abertura" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "Permitir apenas uma execução" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Auto-completar janela de abertura:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Activar janelas múltiplas de comparação para" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Comparação de arquivos" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Comparação de ficheiros" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Repor" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Idioma" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Idiomas disponíveis:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Localizar" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "Localizar:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Apenas palavras completas" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Reconhecer maiúsculas/minúsculas" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "Termo corrente" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "Não ultrapassar fim de ficheiro" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Direcção" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "Acima" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "Abaixo" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "Localizar próximo" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Substituir por:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "Não ultrapassar fim de ficheiro" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Substituir em" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "Selecção" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "Ficheiro completo" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "Substituir" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Substituir todos" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Alteração lógica de maiúsculas/minúsculas" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Comentários" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "Verificar depois de sair" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Filtros de linha" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Ignorar linhas com as seguintes características" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Termos correntes (um por linha):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Diferença:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Diferença seleccionada:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Fundo" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Eliminado" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Diferença ignorada:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Movida:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Movida seleccionada:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Diferença de palavra:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Diferença de palavra seleccionada:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Predefinição" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Diálogo" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Enviar ficheiros eliminados para a Reciclagem" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignorar diferenças de tempo inferiores a 3 segundos" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integração" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "Adicionar ao menu de contexto do explorador" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Activar menu avançado" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "Incluir sub-pastas por predefinição" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "com editor &externo:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "Arquivo do filtro:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Pesquisar..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Gerador de ficheiro patch" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Ficheiro&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Ficheiro&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Pesquisar..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "Trocar" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "Anexar a ficheiro existente" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "Resultado:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "Formato" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "Estilo:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "Contexto:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Espaços" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "Comparar" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Ignorar alterações" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Ignorar todos" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorar linhas em branco" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Reconhecer maiúsculas/minúsculas" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Incluir linha de comando" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir em editor externo" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Mostrar colunas" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Seleccionar extractor" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "E&xtractor de ficheiros:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Mostrar todos os extractores, não verificar extensões" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Lista de extensões:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Descrição:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "Progresso da comparação de arquivos" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "A comparar itens..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Ir para" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "Ir para:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Ficheiro" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "Linha" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "Diferença" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "Ir para" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Espaço" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "Comparar" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "Ignorar alteração" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Ignorar todas" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar linhas em branco" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignorar maiúsculas/minúsculas" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Ignorar diferenças quebras de linhas diferentes (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Activar detecção de bloco movido" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Método de comparação de ficheiros:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "Parar após primeira diferença" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Filtrar comentários" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Destacar sintaxe" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Re-análise automática" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "Manter caracteres EOL originais" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulações" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "Tamanho de tabs:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "Inserir tabulações" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Inserir espaços" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Cores de diferença de linha" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Ver diferenças de linha" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "A nível do caracter" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "A nível da palavra:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filtros de ficheiro" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Testar" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Eliminar..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Guardar ficheiros modificados?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Ficheiro do lado esquerdo" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Guardar alterações" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "Rejeitar alterações" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Ficheiro do lado direito" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "Guardar alterações" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Rejeitar alterações" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Rejeitar tudo" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Página de código" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Página de código predefinida" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session" msgstr "Detectar informação da página de código para estes ficheiros : .html, .rc, .xml\nnecessário reinicializar sessão" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Página de código do sistema" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "A mesma que o interface de utilizador do WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Personalizar página de código:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - suporte de arquivo desactivado" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Impossível detectar versão 7-Zip (não instalada?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation." msgstr "Suporte de arquivo requer a instalação de 7-Zip 3.11 ou mais recente ou os seus\ncomponentes essenciais têm de ser copiados para a pasta de destino do programa para execução autónoma." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Para além disso, deverá haver um plugin de interface adequado (Merge7z*.dll) na pasta do programa." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available." msgstr "Utilize a versão 7-zip recomendada abaixo até que os plugins de interface para versões mais recentes estejam disponíveis." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Versão" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "Plugin required\n(dllbuild %04u)" msgstr "Necessário plugin\n(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Versão recomendada de 7-zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "presente" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-zip instalado no seu computador:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "falta" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes 7-zip para operações autónomas:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "desactualizado" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Plugins na pasta:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from help menu.)" msgstr "Não voltar a exibir esta mensagem.\n(Poderá repor esta mensagem desde o menu de ajuda.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Descarregar plugin" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Opções" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr "Categorias" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Nomes das funções:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Comentários:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Números:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Pré-processador:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Utilizador 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Utilizador 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Relatório de comparação de arquivos" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "Ficheiro do relatório:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "Estilo:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "Copiar para a Área de Transferência" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Filtro partilhado ou privado" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Qual o tipo de filtro que deseja criar?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro partilhado (para todos os utilizadores deste computador)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privado (apenas para o utilizador actual)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Suporte de arquivo" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte de arquivo necessita o plugin 7-zip instalado:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Descarregar o plugin 7-zip" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "Activar suporte de arquivo" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "Utilizar 7-zip autónomo, se disponível" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "Utilizar 7-zip local da pasta WinMerge" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "Detectar tipo de arquivo pela assinatura" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Comparar estatísticas" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Ficheiros:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binário:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Único" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Idêntico" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Afecta" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Seleccionar página de código para" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "Carregar &Ficheiro:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "Guardar &Ficheiro:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "Utilizar a mesma página de código para ambos" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "Aplicar" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "Cancelar" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Testar filtro" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "A testar filtro ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "Inserir texto a testar:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "Nome do arquivo" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "Testar" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "Fechar" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "Utilizar cores de texto personalizadas" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Personalizar cores do texto" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Espaço:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Texto normal:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Selecção:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Destino" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Apenas de leitura" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Apenas de leitura" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Guardar..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "081604e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by C.Simão" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x816, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "Criar documentos\nNovos documentos (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "Abrir um documento existente\nAbrir (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "Close the active document\nClose" msgstr "Fechar o documento activo\nFechar" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "Guardar o documento actual\nGuardar (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "Guardar o documento actual com novo nome\nGuardar como" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "Change the printing options\nPage Setup" msgstr "Modificar as opções de impressão\nConfiguração de página" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "Alterar a impressora e as opções de impressão\nConfiguração de impressão" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "Print the active document\nPrint" msgstr "Imprimir o documento actual\nImprimir" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "Display full pages\nPrint Preview" msgstr "Exibir páginas inteiras\nPré-visualização" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Mostrar todos os itens ocultados" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "Abrir projecto\nProject file (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao abrir projecto" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao guardar projecto" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Projecto:" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Projecto carregado com sucesso." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Projecto guardado com sucesso." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "Guardar localização e opções do projecto\nSave Project File" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "Mostrar informação do programa, número da versão e direitos de autor\nAbout" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "Sair da aplicação; confirmar guardar documentos\nExit" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2693,3437 +2697,3445 @@ msgstr "Sair da aplica #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Abre este documento" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "Mudar para a próxima janela\nNext Pane" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "Voltar à janela anterior\nPrevious Pane" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "Open another window for the active document\nNew Window" msgstr "Abrir outra janela para o documento actual\nNew Window" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "Arrange icons at the bottom of the window\nArrange Icons" msgstr "Ordenar ícones na parte inferior da janela\nArrange Icons" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "Ordenar janelas em cascata\nCascade Windows" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "Ordenar janelas sem sobreposição\nTile Windows" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "Ordenar janelas sem sobreposição\nTile Windows" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "Split the active window into panes\nSplit" msgstr "Dividir a janela activa\nSplit" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "Erase the selection\nErase" msgstr "Apagar a selecção\nErase" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "Erase everything\nErase All" msgstr "Apagar tudo\nErase All" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "Copiar a selecção e colocá-la na Área de Transferência\nCopy" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "Cortar a selecção e colocá-la na Área de Transferência\nCut" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "Find the specified text\nFind" msgstr "Localizar texto especificado\nFind" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "Inserir conteúdo da Área de Transferência\nPaste" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "Repeat the last action\nRepeat" msgstr "Repetir a última acção\nRepeat" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "Substituir texto especificado por texto diferente\nReplace" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "Select the entire document\nSelect All" msgstr "Seleccionar todo o documento\nSelect All" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "Anular a última acção\nUndo (Ctrl+Z)" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "Refazer a anterior acção anulada\nRedo (Ctrl+Y)" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "Mostrar/Ocultar a barra de ferramentas\nToggle ToolBar" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "Mostrar/Ocultar a barra de estado\nToggle StatusBar" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Alterar o tamanho da janela" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Alterar a posição da janela" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um ícone" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho máximo" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Mudar para a janela do próximo documento" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Mudar para a janela do documento anterior" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fechar a janela activa e confirmar guardar documentos" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Aumentar a janela para o tamanho normal" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Activar lista de tarefas" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Activar esta janela" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "Fechar pré-visualização\nCancel Preview" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Manter caracteres EOL originais" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Prima uma tecla" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o botão direito do rato no destino a copiar" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "WinMerge não concede ABSOLUTAMENTE NENHUMA GARANTIA. É software livre e pode redistribuí-lo sob certas condições; para mais detalhes, ver a Licença Pública GNU no menu Ajuda." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "OK" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "Abortar" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "Tentar novamente" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "Ignorar" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Ignorar todos" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "Sim" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Sim para todos" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "Não" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Não para todos" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "Continuar" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "Avançar" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Avançar todos" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Não voltar a exibir esta mensagem." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Não voltar a perguntar." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Cores de sintaxe" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Cores do texto" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Controlo de versão" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Versão %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Opções (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as mensagens estão novamente disponíveis." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Foram efectuadas alterações na sessão actual de comparação de ficheiros. Algumas definições poderão estar activas apenas após reinicializar a actual comparação de ficheiros." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A alteração de fonte seleccionada não será aplicada às janelas de diferenças actuais." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os ficheiros (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Projectos WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1950 +#: Merge.rc:1953 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Conteúdo essencial" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Data de modificação" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Data de modificação e tamanho" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Localização" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Descrição" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Seleccionar nome de ficheiro para novo filtro" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ficheiros de filtros (*.ini)|*.ini|Todos os ficheiros (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, 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:1980 +#: Merge.rc:1983 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Localizar filtro a instalar" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "Destino para cleartool.exe:" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "Destino para SS.EXE:" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Relatório de comparação de arquivos" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Comparação de ficheiros" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Sem título esquerda" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Sem título direita" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Analisando ficheiros..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "A abrir selecção" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "A copiar da esquerda para a direita" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "A copiar da direita para a esquerda" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "A copiar tudo para a esquerda" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "A copiar tudo para a direita" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "A copiar ficheiros..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "A eliminar ficheiros..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "A mover ficheiros..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "A criar relatório..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Diferença %1 de %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenças encontradas" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 diferença encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Item %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dois arquivos ou ficheiros existentes para comparar" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Selecção de pasta" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dois arquivos ou ficheiros para comparar." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "A pasta de destino da esquerda é inválido!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "A pasta de destino da direita é inválida!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Ambas as pastas de destino são inválidas!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleccione dois ficheiros para activar a selecção de extractor." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossível comparar ficheiro ou arquivo!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Ficheiro não encontrado: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Ficheiro não extraído: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "%1\n%2\n\nare identical binary files." msgstr "%1\n%2\n\nsão ficheiros binários idênticos." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "%1\n%2\n\nare different binary files." msgstr "%1\n%2\n\nsão ficheiros binários diferentes." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "%1\n\nis binary file. Cannot compare binary and text files." msgstr "%1\n\né ficheiro binário. Impossível comparar ficheiros binários e ficheiros de texto." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "Impossível abrir ficheiro\n%1\n\n%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Guardar como" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Guardar alterações em %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Erro na verificação de escrita na pasta de destino" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Erro ao criar cópia de segurança" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2087 #, 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:2085 +#: Merge.rc:2088 #, 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:2086 +#: Merge.rc:2089 #, 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:2087 +#: Merge.rc:2090 #, 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:2088 +#: Merge.rc:2091 #, 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:2089 +#: Merge.rc:2092 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again." msgstr "Outra aplicação actualizou o ficheiro\n%1\ndesde a última análise do WinMerge.\n\nSe desejar actualizar os ficheiros, feche o ficheiro de comparação actual e carregue novamente os ficheiros." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Guardar ficheiro esquerdo como..." -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Guardar ficheiro direito como..." -#: Merge.rc:2097 +#: Merge.rc:2100 #, 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:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger ficheiros de VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar comando do sistema de versões." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Base(s) de dados VSS não encontrada(s)!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Erro no VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, 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:2111 +#: Merge.rc:2114 #, 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inferior a 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superior)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Quebra de linha nos espaços" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Quebra de linha nos espaços ou pontuação" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Copiar o item seleccionado para a directoria nomeada" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Copiar o item seleccionado para a directoria personalizada" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Eliminar item seleccionado à esquerda" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Eliminar item seleccionado à direita" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Eliminar item(s) seleccionado(s) em ambos os lados" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ocultar item(s) seleccionado(s) (no filtro)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Renomear o item seleccionado em ambos os lados" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Da direita para a esquerda (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Da esquerda para a direita (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da direita para a esquerda (%1 de %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da esquerda para a direita (%1 de %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Da esquerda para... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Da direita para... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Da esquerda para... (%1 de %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Da direita para... (%1 de %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Direita (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Ambos (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de 2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Direita (%1 de 2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Seleccione pasta de destino" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Lado esquerdo - seleccione pasta de destino:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Lado direito - seleccione pasta de destino:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ficheiros afectados)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 ficheiros afectados)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Tem certeza que deseja copiar todas as diferenças para o lado esquerdo?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Tem certeza que deseja copiar todas as diferenças para o lado direito?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "Are you sure you want to copy\n\n%1\nto\n%2 ?" msgstr "Tem certeza que deseja copiar\n\n%1\nto\n%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Tem certeza que deseja copiar %1 de %2 item(s) seleccionado(s)?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Tem certeza que deseja eliminar %1 de %2 item(s) seleccionado(s)?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "Delete directory\n\n%1 ?" msgstr "Eliminar directoria\n\n%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "Tem certeza que deseja eliminar\n\n%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, 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:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Abrir ficheiro esquerdo" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Abrir ficheiro esquerdo no editor externo" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Abrir ficheiro esquerdo com..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Abrir ficheiro direito" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Abrir ficheiro direito no editor externo" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Abrir ficheiro direito com..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Erro ao executar editor externo: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Extensão desconhecida do editor externo: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Copiar nomes dos ficheiros para a Área de Transferência" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copiar destino do lado esquerdo para a Área de Transferência" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copiar destino do lado direito para a Área de Transferência" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copiar destino de ambos os lados para a Área de Transferência" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Formato de arquivo desconhecido" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Adicionar itens do lado esquerdo ao arquivo" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Adicionar itens do lado direito ao arquivo" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Adicionar itens de ambos os lados ao arquivo" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Adicionar outros itens ao arquivo (ambos os lados)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Nome do ficheiro" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Pasta" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Resultado da comparação" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Data da esquerda" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Data da direita" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Extensão" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Lado esquerdo" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Lado direito" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Lado direito (Curto)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Lado esquerdo (Curto)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Data de criação - Esq" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Data de criação - Dta" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Ficheiro mais recente" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Versão do ficheiro esquerdo" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Versão do ficheiro direito" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Resultado resumido" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Atributos esq" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Atributos dta" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "EOL esq" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "EOL dta" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Codificação esq" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Codificação dta" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Diferença ignorada." -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Diferenças" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binário" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Impossível comparar ficheiros" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Item abortado" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Ficheiro omitido" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Arquivo omitido" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Os ficheiros binários são idênticos" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Os ficheiros binários são diferentes" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Os ficheiros são diferentes" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Apenas esquerda" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Apenas direita" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %Id ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 item seleccionado" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 itens seleccionado" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Nome do ficheiro ou pasta." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome de sub-ficheiro quando sub-ficheiros incluídos." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Resultado da comparação, forma extensa." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Data de modificação do lado esquerdo." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Data de modificação do lado direito." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Extensão do ficheiro." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do ficheiro em bytes." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do ficheiro direito em bytes." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do ficheiro esquerdo abreviado." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do ficheiro direito abreviado." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Data de criação do lado esquerdo." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Data de criação do lado direito." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Indica o lado com a data de modificação mais recente." -#: Merge.rc:2301 +#: Merge.rc:2304 #, 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:2302 +#: Merge.rc:2305 #, 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:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Resultado resumido da comparação." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Tipo de ficheiro EOL do lado esquerdo" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Tipo de ficheiro EOL do lado direito" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Codificação do lado esquerdo." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Codificação do lado direito." -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Apresenta um asterisco (*) se ficheiro for binário." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 com %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Lista separada por vírgulas" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabulações" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "HTML simples" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "HTML simples" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "Error creating the report:\n%1" msgstr "Erro ao criar relatório:\n%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "O relatório foi criado com sucesso." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo ficheiro está aberto em ambas as janelas." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Os ficheiros seleccionados são idênticos." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "A pasta seleccionada existe apenas em outra localização e não pode ser aberto." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocorreu um ero ao comparar os ficheiros." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Os ficheiros binários não podem ser comparados visualmente." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "As directorias não podem ser comparados visualmente." -#: Merge.rc:2344 +#: Merge.rc:2347 #, 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:2345 +#: Merge.rc:2348 #, c-format msgid "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?" msgstr "Os EOL são de tipos diferentes (DOS/UNIX/MAC) no ficheiro '%1'.\n Com as opções actuais, serão unificados no tipo principal.\n Deseja alterar as opções e preservar os EOL diferentes?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Ocorreu um erro ao pré-diferenciar o ficheiro %1' com o plugin %2'. A pré-diferenciação não será aplicada." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "O arquivo seleccionado é inválido." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossível abrir ficheiro binário no editor." -#: Merge.rc:2354 +#: Merge.rc:2357 #, 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Atenção: Os ficheiros utilizam codificações diferentes, esquerda=%s e direita=%s e combinar poderá causar perda de informação." -#: Merge.rc:2356 +#: Merge.rc:2359 #, 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:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informações perdidas devido a erros de codificação: ficheiro direito" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informações perdidas devido a erros de codificação: ficheiro esquerdo" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Sem diferenças" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Diferença de linha" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituída(s) %1 string(s)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposível localizar string \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Copiar localização completa" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Copiar nome de ficheiro" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Janela de localização" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Janela de diferenças" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Ficheiro patch escrito com sucesso." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. item não encontrado ou é uma directoria!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. item não encontrado ou é uma directoria!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 itens seleccionados]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Impossível escrever no ficheiro %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, 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:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Especifique o ficheiro de destino" -#: Merge.rc:2403 +#: Merge.rc:2406 #, 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:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossível criar ficheiro patch a partir de directorias." -#: Merge.rc:2405 +#: Merge.rc:2408 #, 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:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "O arquivo não existe." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Os resultados de comparação da directoria actual serão eliminados." -#: Merge.rc:2412 +#: Merge.rc:2415 #, 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:2413 +#: Merge.rc:2416 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "\nNota: integração 7-Zip desactivada nas definições do WinMerge." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "\nNota: integração 7-Zip está restricta a operação autónoma nas definições do WinMerge." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Seleccione ficheiro a exportar" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Seleccione ficheiro a importar" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Opções importadas do ficheiro." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Opções exportadas para o ficheiro." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Importação de opções do ficheiro falhou." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Escrita de opções para o ficheiro falhou." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Erro de expressão regular" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Sem coincidências" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Expressão regular inválida" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Caracter de intercalação inválido" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Nome de classe de caracter inválido" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Referência anterior inválida" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Sem coincidências [ ou [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Sem coincidências ( ou \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Sem coincidências \\(" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Conteúdo inválido de \\(\\)" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Fim de zona inválido" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Sem memória" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Expressão regular anterior inválida" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Fim prematuro da expressão regular" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Expressão regular demasiado extensa" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Sem coincidências ) ou \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanês" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Árabe (Arábia Saudita)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Árabe (Iraque)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Árabe (Egípcio)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Árabe (Líbio)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Árabe (Argelino)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Árabe (Marroquino)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Árabe (Tunisino)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Árabe (Omã)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Árabe (Iemenita)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Árabe (Sírio)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Árabe (Jordano)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Árabe (Libanês)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Árabe (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Árabe (EAU)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Árabe (Bahrein)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Árabe (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Arménio" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azeri (Latino)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azeri (Cirílico)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Basco" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Bielorusso" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Búlgaro" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalão" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chinês (Tradicional)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chinês (Simplificado)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chinês (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chinês (Singapura)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chinês (Macau)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Croata" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Checo" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Dinamarquês" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Neerlandês" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Neerlandês (Bélgica)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Inglês (EUA)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Inglês (RU)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Inglês (Austrália)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Inglês (Canadá)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Inglês (Nova Zelândia)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Inglês (Irlanda)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Inglês (África do Sul)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Inglês (Jamaica)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Inglês (Caraíbas)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Inglês (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Inglês (Trinidade)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Inglês (Zimbabué)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Inglês (Filipinas)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Estónia" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Faroé" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Sueco" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Francês" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Francês (Bélgica)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Francês (Canadá)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Francês (Suíça)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Francês (Luxemburgo)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Francês (Mónaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgiano" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Alemão (Alemanha)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Alemão (Suíça)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Alemão (Áustria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Alemão (Luxemburgo)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Alemão (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Grego" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebreu" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Hindu" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Húngaro" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Islandês" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonésio" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italiano" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italiano (Suíça)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japonês" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Cachemir (Índia)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Casaque" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Coreano" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Coreano (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Letónia" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lituano" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malaio (Malásia)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malaio (Sultanato do Brunei)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norueguês (Bokml)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norueguês (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polaco" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Português (Portugal)" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Português (Brasil)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Romeno" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Russo" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sânscrito" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Sérvio (Latino)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Sérvio (Cirílico)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Eslovaco" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Esloveno" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Espanhol" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Espanhol (México)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Espanhol (Moderno)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Espanhol (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Espanhol (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Espanhol (Panamá)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Espanhol (Dominicano)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Espanhol (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Espanhol (Colômbia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Espanhol (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Espanhol (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Espanhol (Equador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Espanhol (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Espanhol (Uruguai)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Espanhol (Paraguai)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Espanhol (Bolívia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Espanhol (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Espanhol (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Espanhol (Nicarágua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Espanhol (Porto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Quénia)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Sueco" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Sueco (Finlândia)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatar (Tartária)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Tailandês" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turco" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ucraniano" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "Urdu (Paquistão)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (Índia)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Usbeque (Latino)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Usbeque (Cirílico)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamita" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Europeu Ocidental" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Europeu Oriental" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Ásia Oriental" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "Ásia SE & SO" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Médio Oriente" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Não aplicável" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cirílico" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS EUA Latino" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Árabe" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grego" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Eixo Báltico" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latino 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grego 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latino 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cirílico" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turco" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Português" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandês" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreu" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Canadá Francês" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nórdico" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cirílico CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grego 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Tailandês" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japonês" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chinês (Simplificado)" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Coreano" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chinês (Tradicional)" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Latino 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cirílico (Eslavo)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Latino 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Grego" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latino 5 (Turco)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreu" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Árabe" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Eixo Báltico" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamita" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Românico" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grego" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cirílico" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "Macintosh" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europa Central" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turco" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Aproximadamente ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Aproximadamente ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Aproximadamente ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Aproximadamente ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Aproximadamente ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "B" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "KB" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "MB" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "GB" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "TB" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "PB" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Guardar ficheiro esquerdo" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Guardar ficheiro direito" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Guardar ficheiro com o nome..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Guardar ficheiro direito com o nome..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Alterar estado \"apenas de leitura\" de ficheiro/dir esquerdo" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Alterar estado \"apenas de leitura\" de ficheiro/dir direito" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Converter EOL para modo DOS" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Converter EOL para modo UNIX" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Converter EOL para modo MAC" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Alternar entre modos de edição e combinação" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "Ver e ajustar propriedades de codificação\nPropriedades de codificação do ficheiro" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "Seleccionar área de diferenças na linha actual\nDiferença na linha actual" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "Ir para linha ou diferença\nIr para (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "Set program options\nOptions" msgstr "Definir opções do programa\nOpções" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "Actualizar visualização\nActualizar (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar linhas seleccionadas para a Área de Transferência adicionando nºs de linha ao início de linha" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Actualizar itens seleccionados" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Alternar marcações" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Ir para a próxima marcação" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Ir para a marcação anterior" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Eliminar todos os marcadores" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "Mostrar itens exactamente iguais\nMostrar itens idênticos" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "Mostra itens com diferenças\nMostra itens diferentes" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "Mostra itens exstentes apenas no lado esquerdo\nMostra itens únicos da esquerda" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "Mostra itens exstentes apenas no lado direito\nMostra itens únicos da direita" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "Mostra ficheiros binários\nMostra ficheiros binários" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "Mostra itens omitidos\nMostra itens omitidos" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "Selecciona a fonte de visualização\nSelecciona fonte de visualização" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "Repor fonte do sistema predefinida de visualização\nFonte predefinida" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Mostra espaços em branco" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Mostrar/Ocultar janela de diferenças" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Janela de localização mostra visão geral dosficheiros" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostra estatísticas da comparação de arquivos" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "Select the current user interfacce language\nLanguage" msgstr "Selecciona o idioma do actual interface de utilizador\nIdioma" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "Shows differences inside lines with different color\nShow Line Diff" msgstr "Mostra diferenças as linhas com cores diferentes\nMostra diferenças de linha" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Troca a posição das duas janelas" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "Mostra os números de linha\nMostra números de linha" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "Ajustar comprimento de linhas à largura da janela\nAjustar linhas" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "Scroll to the previous difference\nPrev Diff (Alt+Up)" msgstr "Ir para a diferença anterior\nDiferença anterior (Alt+Para cima)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "Scroll to the next difference\nNext Diff (Alt+Down)" msgstr "Ir para a próxima diferença\nPróxima diferença (Alt+Para baixo)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "Scroll to the first difference\nFirst Diff (Alt+Home)" msgstr "Ir para a primeira diferença\nPrimeira diferença (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "Scroll to the current difference\nCurrent Diff (Alt+Enter)" msgstr "Ir para a diferença actual\nDiferença actual (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "Scroll to the last difference\nLast Diff (Alt+End)" msgstr "Ir para a última diferença\nÚltima diferença (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "Copiar o texto seleccionado para oficheiro esquerdo\nCopiar à direita (Alt+Direita)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "Copiar o texto seleccionado para o ficheiro esquerdo\nCopiar à esquerda (Alt+Esquerda)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "Copiar diferença para a direita e avançar para a próxima\nCopiar à direita e avançar (Ctrl+Alt+Direita)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "Copiar diferença para a esquerda e avançar para a próxima\nCopiar à esquerda e avançar (Ctrl+Alt+Esquerda)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "Copiar todas as diferenças para o ficheiro da direita\nTodas à direita" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "Copiar todas as diferenças para o ficheiro da esquerda\nTodas à esquerda" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Eliminar itens seleccionados de ambas as directorias" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparar o item seleccionado (comparar primeiro item, se vários itens seleccionados)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleccionar e reordenar colunas de comparação da directoria" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Gerar ficheiro patch" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Seleccionar e modificar filtros" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Gera um relatório dos resultados de comparação" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "O utilizador selecciona o extractor (sem extracção quando comparando dir)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleccione um extractor para editar este ficheiro" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Não pré-diferenciar (normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarregar todos os plugins e recarregá-los (para developers)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "Activates next file visible\nActive next File" msgstr "Activa o próximo ficheiro visível\nActivar próximo ficheiro" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Fecha todas as janelas abertas" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "Displays the WinMerge User's Guide\nHelp" msgstr "Mostra o Guia do Utilizador do WinMerge\nAjuda" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Exporta a versão actual de WinMerge e a configuração para um ficheiro de texto" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Mostrar a licença pública GNU" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Compilação privada: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "Opens WinMerge Help Index\nHelp Index" msgstr "Abre o índice da ajuda do WinMerge\nÍndice da ajuda" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "Opens WinMerge Help Search\nHelp Search" msgstr "Abre a pesquisa da ajuda do WinMerge\nPesquisa da ajuda" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Definições de plugin" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Não pré-diferenciar" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Pré-diferenciar, se possível" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH não encontrado - scripts .sct desactivados" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Abrir ficheiro com a aplicação registada" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Abrir ficheiro com editor externo" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Abrir ficheiro com programa específico" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Não mostrar blocos movidos" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Mostrar todos os blocos movidos" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mostrar blocos movidos apenas da diferença actual" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Ir para a diferença sob o cursor" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Ir para diferença %1 de %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "Ir para linha %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Desactivado" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Do sistema de ficheiros" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Da lista MRU" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Russian.po b/Src/Languages/Russian.po index 32201c90b..a53d46a85 100644 --- a/Src/Languages/Russian.po +++ b/Src/Languages/Russian.po @@ -73,7 +73,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Êîïèðîâàòü" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "&Âñòàâèòü" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "Ïåðåéòè ê ñòðîêå..." @@ -96,43 +96,43 @@ msgid "Op&en" msgstr "Îòêðûòü" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "çàðåãèñòðèðîâàííûì ïðèëîæåíèåì" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "âíåøíèì ðåäàêòîðîì" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "ñ ïîìîùüþ..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Ôàéë" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "Íîâûé\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Îòêðûòü...\tCtrl+O" @@ -148,8 +148,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Îòêðûòü ïðîåêò...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Ñîõðàíèòü ïðîåêò..." @@ -160,1845 +160,1852 @@ msgid "Recent Projects" msgstr "Íåäàâíèå ïðîåêòû" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "Â&ûõîä" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Ðåäàêòèðîâàòü" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Íàñòðîéêè..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Âèä" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Âûáðàòü &Øðèôò..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Èñïîëüçîâàòü øðèôò ïî &óìîë÷àíèþ" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "Ïà&íåëü èíñòðóìåíòîâ" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "&Íåò" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "&Ìàëåíüêèå çíà÷êè" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Áîëüøèå çíà÷êè" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "&Ñòðîêà ñîñòîÿíèÿ" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "Ïàíåëü òàáîâ" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&ßçûê..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Èíñòðóìåíòû" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Ôèëüòðû..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Ñîçäàòü ïàò÷..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Ïëàãèíû" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "Ðàñïàêîâêà âðó÷íóþ" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "Ðàñïàêîâêà àâòîìàòè÷åñêè" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "Ðåäàêòèðîâàòü ñ ðàñïàêîâùèêîì" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Ïåðåãðóçèòü âñå ïëàãèíû" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "Îòëà&äêà" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "&Çàãðóçèòü íàñòðîéêè..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "&Ñáðîñèòü íàñòðîéêè" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Îêíî" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "Çàêðûòü" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Çàêðûòü âñå" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Ïåðåêëþ÷èòü &Îêíî\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Ðàçìåñòèòü &Ãîðèçîíòàëüíî" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Ðàçìåñòèòü &Âåðòèêàëüíî" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Êàñêàä" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Ïîìîùü" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Ñîäåðæàíèå...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Èíäåêñ..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Ïîèñê..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "&Êîíôèãóðàöèÿ..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Ïîääåðæêà &àðõèâîâ îòêëþ÷åíà..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "GNU &Public License..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&Î ïðîãðàììå WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Îòêðûòü ïðîåêò...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Ôàéë ñ&ëåâà òîëüêî äëÿ ÷òåíèÿ" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Ôàéë ñ&ïðàâà òîëüêî äëÿ ÷òåíèÿ" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "Êîäèðîâêà ôàéëà" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Â&ûáðàòü Âñå\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Îäèíàêîâûå" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Ðàçëè÷íûå" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Óíèêàëüíûå ñëåâà" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Óíèêàëüíûå ñïðàâà" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Ïðîïóùåííûå" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Áèíàðíûå ôàéëû" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Ñêðûòûå" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Ñðàâíèòü ñòàòèñòèêè" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Îáíîâèòü\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Îáíîâèòü &âûäåëåííûå\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Îáúåäèíåíèå" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Ñðàâíèòü\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Ñëåäóþùåå îòëè÷èå\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Ï&ðåäûäóùåå îòëè÷èå\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Ïåð&âîå îòëè÷èå\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Òåêóùåå îòëè÷èå\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Ïîñë&åäíåå îòëè÷èå\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Ñêîïèðîâàòü íà &ïðàâóþ ïàíåëü\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Ñêîïèðîâàòü íà &ëåâóþ ïàíåëü\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Óäàëèòü\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Íàñòðîèòü êîëîíêè..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Ñîçäàòü &îò÷åò..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Ñîõðàíèòü\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Ñîõðàíèòü ôàéë ñ&ëåâà" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Ñîõðàíèòü" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Ñîõðàíèòü &êàê..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Ñîõðàíèòü ôàéë ñ&ïðàâà" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Ïå÷àòü..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "Ïàðàìåòðû ñòðàíèöû..." -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "Ïðåäâàðèòåëüíûé ïðîñìîòð" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Çàìåíèòü ïåðåíîñû ñòðîê íà" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "&DOS (CRLF)" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "&UNIX (LF)" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "&MAC (CR)" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Ðåæèì ñëèÿíèÿ\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Îòìåíà\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Â&åðíóòü\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Âû&ðåçàòü\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Êîïèðîâàòü\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Âñòàâèòü\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Âûáðàòü îòëè÷èå\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Íàéòè...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Çàìåíèòü...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Ñêðèïòû" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Íåò >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "&Äîïîëíèòåëüíî" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Êîïèðîâàòü ñ íóìåðàöèåé ñòðîê\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Çàêëàäêè" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Çàêëàäêà\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Ñëåäóþùàÿ çàêëàäêà\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Ïðåäûäóùàÿ çàêëàäêà\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Óäàëèòü âñå çàêëàäêè" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Ïåðåéòè ê ñòðîêå...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Ïîäñâåòêà ñèíòàêñèñà" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Ïîêàçû&âàòü íåâèäèìûå" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Ïîêàçûâàòü îòëè÷èÿ â ñòðîêàõ" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Ïîêàçûâàòü íîìåðà ñòðîê" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Ïîêàçûâàòü ïîëÿ" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "Ïåðåíîñ ïî ñëîâàì" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "Ïîìåíÿòü ïàíåëè ìåñòàìè" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Ïàíå&ëü ñðàâíåíèÿ" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Ïàíåëü ìåñòîïîëîæåíèé" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Ñêîïèðîâàòü íà ïðàâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Ñêîïèðîâàòü íà ëåâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Ñê&îïèðîâàòü âñå íà ïðàâóþ ïàíåëü" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Ñêîï&èðîâàòü âñå íà ëåâóþ ïàíåëü" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Ïðåäñðàâíåíèå" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "Ñ&ðàâíèòü" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "Ñëåâà íàïðàâî" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "Ñëåâà íà ..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "Ñïðàâà íàëåâî" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "Ñïðàâà íà ..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Ïåðåìåñòèòü" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Ñëåâà â..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&Ñïðàâà â..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "Óäàëèòü" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "Ñëåâà" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "Ñïðàâà" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "Îáà" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "&Ïåðåèìåíîâàòü" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "&Ñêðûòü" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "Îòêðûòü ëåâûé ôàéë" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Îòêðûòü ïðàâûé ôàéë" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Ñêîïèðîâàòü ïóòè" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "Ñ&ëåâà (%1 èç %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "Ñ&ïðàâà (%1 èç %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "Î&áà (%1 èç %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Ñêîïèðîâàòü &èìåíà ôàéëîâ" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "&Çààðõèâèðîâàòü" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "Ñ&ëåâà... (%1 èç %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "Ñ&ïðàâà... (%1 èç %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "Î&áà... (%1 èç %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Òîëüêî &îòëè÷èÿ... (%1 èç %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "&Îáíîâèòü" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "Ñêîïèðîâàòü ïîëíûé ïóòü" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Ñêîïèðîâàòü èìÿ ôàéëà" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Ïàðàìåòðû ïðåäñðàâíåíèÿ" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Íåò ïðåäñðàâíåíèÿ" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "&Àâòîïðåäñðàâíåíèå" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Ïåðåéòè ê &îòëè÷èþ" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Áåç ïåðåìåùåííûõ áëîêîâ" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Âñå ïåðåìåùåííûå áëîêè" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Ïåðåìåù. áëîê äëÿ &äàííîãî îòëè÷èÿ" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Î ïðîãðàììå WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(×àñòíûé áèëä)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Âñå ïðàâà çàùèùåíû." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Ïîñåòèòå äîìàøíþþ ñòðàíèöó WinMerge !" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "ÎÊ" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Äàðèòåëè" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Âûáåðèòå ôàéëû èëè ïàïêè..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Ëåâûé:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Îáçîð..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Ïðàâûé:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "Îá&çîð..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Ôèëüòð:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Âûáðàòü..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "&Ðàñïàêîâùèê:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Âûáðàòü..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Âêëþ÷àÿ ïîäïàïêè" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Ñòàòóñ:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Îòìåíà" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Ïîìîùü" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Ôàéëû èëè ïàïêè äëÿ ñðàâíåíèÿ" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Áàçà äàííûõ:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Ïðîåêò:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Ïîëüçîâàòåëü:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Ïàðîëü:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Ïóòü ê ïðîåêòó VSS" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Ïðèìåíèòü êî âñåì ýëåìåíòàì" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Âçÿòü ïîä êîíòðîëü" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Ñîõðàíèòü êàê..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Ñèñòåìà êîíòðîëÿ âåðñèé" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Ñèñòåìà êîíòðîëÿ âåðñèé:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ïóòü ê cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Îñíîâíûå" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Àâòîìàòè÷åñêè &óñòàíîâèòü íà ïåðâîå îòëè÷èå" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "Îòêëþ÷èòü &çàñòàâêó" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Çà&êðûâàòü îêíà êëàâèøåé ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Àâòîìàòè÷åñêè ïðîâåðÿòü ïóòè â äèàëîãå îòðûòèÿ ôàéëîâ" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "&Ðàçðåøèòü çàïóñê òîëüêî îäíîé êîïèè" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "Ñïðîñèòü ïåðåä çàêðûòèåì íåñêîëüêèõ îêîí" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Î&òêðûòü äèàëîã Àâòîäîïîëíåíèÿ:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Âêëþ÷èòü îêíà ìíîæåñòâåííîãî ñðàâíåíèÿ äëÿ" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Ñðàâíåíèÿ &ïàïîê" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Ñðàâíåíèÿ &ôàéëîâ" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge íå ïîêàçûâàåò íåêîòîðûå ñîîáùåíèÿ. Íàæìèòå Ñáðîñ, ÷òîáû ïîêàçûâàëèñü âñå ñîîáùåíèÿ." -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Ñáðîñ" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "ßçûê" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Äîñòóïíûå ÿçûêè:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Íàéòè" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Ïîèñê:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Èñêàòü ñëîâà &öåëèêîì" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Ó÷èòûâàòü &ðåãèñòð" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "Ðå&ãóëÿðíûå âûðàæåíèÿ" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "Í&å ïåðåíîñèòü â êîíöå ôàéëà" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Íàïðàâëåíèå" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Ââåðõ" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "Â&íèç" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Äàëåå" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Çàìåíà" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Çà&ìåíà: " -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "Íå îñòàíàâëèâàòüñÿ ïðè äîñòèæåíèè êîíöà ôàéëà" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Çàìåíèòü" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr " âû&äåëåííîì" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "Âî âñåì &ôàéëå" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Çàìåíèòü" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Ç&àìåíèòü âñå" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "Ïðîâåðèòü" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Êîììåíòàðèè" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ïîñëå checkout" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Ñòðîêîâûå ôèëüòðû" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Ðàçðåøèòü ñòðîêîâûå ôèëüòðû" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ðåãóëÿðíûå âûðàæåíèÿ (îäíî íà ñòðîêó):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Ñîõðàíèòü" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "Íîâûé" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Ðåäàêòèðîâàòü" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "Óäàëèòü" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Öâåòà" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Îòëè÷èå:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Âûäåëåííîå îòëè÷èå:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Ôîí" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Óäàëåííîå" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Òåêñò" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Èãíîðèðóåìûå îòëè÷èÿ:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Ïåðåìåùåííûå:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Âûáðàííûå ïåðåìåùåííûå:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Ñëîâàðíîå îòëè÷èå:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Âûäåëåííîå ñëîâàðíîå îòëè÷èå:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Ïî óìîë÷àíèþ" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Äèàëîã" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Ñèñòåìà" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Ïîìåùàòü óäàëåííûå ôàéëû â êîðçèíó" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Èãíîðèðîâàòü ðàçíèöó âðåìåíè ìåíåå 3 ñåêóíä" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Èíòåãðàöèÿ" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "Äîáàâèòü â &êîíòåêñòíîå ìåíþ ïðîâîäíèêà" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Â&êëþ÷èòü ðàñøèðåííîå ìåíþ" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "Îáðàáàòûâàòü ïîäïàïêè ïî óìîë÷àíèþ" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "Âíåøíèé ðåäàêòîð:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "&Ôèëüòðû:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Îáçîð..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Ãåíåðàòîð ïàò÷åé" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Ôàéë 1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Ôàéë 2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Îáçîð..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "Ïîìåíÿòü" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "Äîáàâèòü â ñóùåñòâóþùèé ôàéë" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "Ðåçóëüòàò:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "Ôîðìàò" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "Ñòèëü:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "Êîíòåêñò:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Íåâèäèìûå" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "Ñðàâíèòü" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Èãíîðèðîâàòü èçìåíåíèÿ" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Èãíîðèðîâàòü âñå" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ïðîïóñêàòü ïóñòûå ñòðîêè" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "×óâñòâèòåëüíîñòü ðåãèñòðà" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Âêë&þ÷àÿ êîììàíäíóþ ñòðîêó" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Îòêðûòü âî âíåøåì ðåäàêòîðå" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Îòîáðàæàòü êîëîíêè" -#: Merge.rc:1065 +#: Merge.rc:1068 #, fuzzy, c-format msgid "Move &Up" msgstr "&Ââåðõ" -#: Merge.rc:1066 +#: Merge.rc:1069 #, fuzzy, c-format msgid "Move &Down" msgstr "Â&íèç" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Âûáîð ðàñïàêîâùèêà" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Ôàéë ðàñïàêîâùèêà:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Ïîêàçûâàòü âñå ðàñïàêîâùèêè, íå ïðîâåðÿÿ ðàñøèðåíèÿ" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Ñïèñîê ðàñøèðåíèé:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Îïèñàíèå:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr " Ñðàâíåíèå ïàïîê" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Îñòàíîâèòü" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Èäåò ñðàâíåíèå..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Îáðàáîòàíî:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Âñåãî:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Ïåðåéòè" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "&Íà:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Ôàéë" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Íà ÷òî" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "&Ñòðîêó" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Îòëè÷èå" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "Ïåðåéò&è" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Ñðàâíåíèå" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Íåâèäèìûå" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "Ó÷èòûâàòü &íåâèäèìûå" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "Èãíîðèðîâàòü èçìåíåííûå íåâèäèìûå" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Èãíîðèðîâàòü &âñå íåâèäèìûå" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Èãíîðèðîâàòü ïóñò&ûå ëèíèè" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Èãíîðèðîâàòü ð&åãèñòð" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Èã&íîðèðîâàòü ðàçëè÷èÿ âîçâðàòîâ êàðåòêè (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Îáíàðóæåíèå ïåðåìå&ùåííûõ áëîêîâ" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "Èñêàòü ïîõîæèå ñòðîêè" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Ìåòîä ñðàâíåíèÿ &ôàéëîâ:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "&Îñòàíàâëèâàòüñÿ ïîñëå ïåðâîãî îòëè÷èÿ" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Ôèëüòð êîììåíòàðèåâ" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Ðåäàêòîð" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Ïîäñâå÷èâàòü ñèíòàêñèñ" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Àâòî&ïåðåñêàíèðîâàíèå" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "Îðèãèíàëüíûå ñèìâîëû EOL" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Îòñòóïû" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "Ðàçìåð &îòñòóïà:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "&Òàáóëÿöèè" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "&Ïðîáåëû" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Ïîäñâåòêà îòëè÷èé â ñòðîêå" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Ïîêàçûâàòü îòëè÷èÿ â ñòðîêå" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "Ïîñèìâîëüíî" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "Ïî ñëîâàì:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Ôèëüòðû ôàéëîâ" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Òåñò" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Óñòàíîâèòü..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Íîâûé..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Èçìåíèòü..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Óäàëèòü..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Ñîõðàíèòü èçìåíåíèÿ â ôàéëàõ" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Ôàéë ñ ëåâîé ñòîðîíû" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Ñîõðàíèòü èçìåíåíèÿ" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Îòêëîíèòü èçìåíåíèÿ" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Ôàéë ñ ïðàâîé ñòîðîíû" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "Ñî&õðàíèòü èçìåíåíèÿ" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Î&òêëîíèòü èçìåíåíèÿ" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Îòêëîíèòü âñå" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Êîäîâàÿ ñòðàíèöà" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Êîäîâàÿ ñòðàíèöà ïî óìîë÷àíèþ" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Âûáåðèòå êîäîâóþ ñòðàíèöó ïî óìîë÷àíèþ, äëÿ íå Þíèêîä-ôàéëîâ:" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2007,56 +2014,56 @@ msgstr "" "Îïðåäåëÿòü êîäîâóþ ñòðàíèöó äëÿ ñëåäóþùèõ ôàéëîâ : .html, .rc, .xml \n" "íóæíî îòêðûòü ôàéë çàíîâî" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Ñèñòåìíàÿ êîäîâàÿ ñòðàíèöà" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr " çàâèñèìîñòè îò èíòåðôåéñà ïîëüçîâàòåëÿ WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Äðóãàÿ êîäîâàÿ ñòðàíèöà:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Ïîääåðæêà àðõèâîâ îòêëþ÷åíà" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Íåâîçìîæíî îïðåäåëèòü âåðñèþ 7-Zip (íå óñòàíîâëåí?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "Äëÿ ðàáîòû ñ àðõèâàìè òðåáóåòñÿ ëèáî óñòàíîâëåííûé 7-Zip âåðñèé 3.11 è âûøå, ëèáî åãî êîìïîíåíòû â ïàïêå ñ WinMerge." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Òàê æå òðåáóåòñÿ ïëàãèí (Merge7z*.dll)" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Ðåêîìåíäóåòñÿ èñïîëüçîâàòü ñëåäóþùóþ âåðñèþ 7-Zip" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Âåðñèÿ" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2065,54 +2072,54 @@ msgstr "" "Òðåáóåìûé ïëàãèí\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Ðåêîìåíäóåìàÿ âåðñèÿ 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "èìååòñÿ" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Âåðñèÿ 7-Zip íà âàøåé ìàøèíå:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "ïóñòî" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "îòñóòñòâ." -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Êîìïîíåíòû 7-Zip â ïàïêå ñ WinMerge:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "óñòàðåë" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Äîñòóïíûå ïëàãèíû:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2121,486 +2128,486 @@ msgstr "" "Áîëüøå íå ïîêàçûâàòü ýòî &ñîîáùåíèå.\n" "(Âû âñåãäà ìîæåòå âåðíóòü åãî ÷åðåç ìåíþ ïîìîùè.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Ñêà÷àòü ïëàãèíû" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Íàñòðîéêà" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Êàòåãîðèè" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Èìïîðò..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Ýêñïîðò..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Êëþ÷åâûå ñëîâà:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Èìåíà ôóíêöèé:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Êîììåíòàðèè:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "×èñëà:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Îïåðàòîðû:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Ñòðîêè:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Ïðåïðîöåññîð:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Ïîëüçîâàòåëü 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Ïîëüçîâàòåëü 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Æèðíûé" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Îò÷åò ñðàâíåíèÿ êàòàëîãîâ" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "&Ôàéë îò÷åòà:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Ñòèëü:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "Êîïèðîâàòü â áóôåð îáìåíà" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Îáùèå è ëè÷íûå ôèëüòðû" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Êàêîé òèï ôèëüòðà âû õîòèòå ñîçäàòü?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Îáùèé ôèëüòð (äëÿ âñåõ ïîëüçîâàòåëåé ýòîé ìàøèíû)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Ëè÷íûé ôèëüòð (òîëüêî äëÿ òåêóùåãî ïîëüçîâàòåëÿ)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Ïîääåðæêà àðõèâîâ" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Ïîääåðæêà àðõèâîâ òðåáóåò íàëè÷èå ïëàãèíà 7-Zip:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Ñêà÷àòü ïëàãèí 7-zip" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Âêëþ÷èòü ïîääåðæêó àðõèâîâ" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Åñëè âîçìîæíî, èñïîëüçîâàòü ñòîðîííèé 7-Zip" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "&Èñïîëüçîâàòü 7-Zip èç ïàïêè WinMerge" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Îïðåäåëÿòü òèï àðõèâà ïî ñèãíàòóðå/çàãîëîâêó ôàéëà" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Ñðàâíåíèå ñòàòèñòèêè" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Ïàïêè:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Ôàéëû:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Îòëè÷àþòñÿ" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Òåêñò:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Áèíàðíûå:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Óíèêàëüíûå" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Ñëåâà:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Ñïðàâà:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Îäèíàêîâûå" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Âñåãî:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Çàêðûòü" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Ïðèìåíèòü ê:" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(ïðèìåíèòü)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Âûáðàòü êîäîâóþ ñòðàíèöó äëÿ" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "Çàãðóçêà ôàéëà:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "Ñîõðàíåíèå ôàéëà:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "Èñïîëüçîâàòü îäíó è òó æå êîäîâóþ ñòðàíèöó" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "&Ïðèìåíèòü" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Îòìåíà" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Òåñò ôèëüòðà" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Òåñòèðîâàòü ôèëüòð ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "Ââåäèòå òåñòîâûé òåêñò:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "Ïàïêà" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Ðåçóëüòàò:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "&Òåñòèðîâàòü" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Çàêðûòü" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "Èñïîëüçîâàòü îñîáûå öâåòà" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Íàñòðîèòü öâåòà" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Íåâèäèìûå:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Îáû÷íûé òåêñò:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Âûäåëåííûé òåêñò:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Ïóòè" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Òîëüêî ÷òåíèå" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Òîëüêî ÷òåíèå" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Îòêðûòü..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Ñîõðàíèòü..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Ðåçåðâíûå êîïèè" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Ñîçäàòü ðåçåðâíûå ôàéëû â:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Ñîçäàòü ðåçåðâíûå ôàéëû:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "â ïàïêå ñ îðèãèíàëüíûì ôàéëîì" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "â îáùåé ïàïêå:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Èìÿ ðåçåðâíîãî ôàéëà:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "&Äîáàâèòü ðàñøèðåíèå .bak" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "Äîáàâèòü äàòó" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "Ïîäòâåðæäåíèÿ" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Âû äåéñòâèòåëüíî õîòèòå ñêîïèðîâàòü XXX ýëåìåíòîâ?" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "Ñëåâà" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "Íàïðàâî" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Äà" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "Íåò" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041904e3" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Dmitriy S. Aleshkowskiy" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x419, 1251" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Ãîòîâî" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2609,7 +2616,7 @@ msgstr "" "Ñîçäàòü ïóñòûå äîêóìåíòû\n" "New Documents (Ctrl-N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2618,7 +2625,7 @@ msgstr "" "Îòêðûòü ñóùåñòâóþùèé äîêóìåíò\n" "Open (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2627,7 +2634,7 @@ msgstr "" "Çàêðûòü àêòèâíûé äîêóìåíò\n" "Close" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2636,7 +2643,7 @@ msgstr "" "Ñîõðàíèòü àêòèâíûé äîêóìåíò\n" "Save (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2645,7 +2652,7 @@ msgstr "" "Ñîõðàíèòü àêòèâíûé äîêóìåíò ïîä íîâûì èìåíåì\n" "Save As" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2654,7 +2661,7 @@ msgstr "" "Èçìåíèòü íàñòðîéêè ïå÷àòè\n" "Page Setup" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2663,7 +2670,7 @@ msgstr "" "Èçìåíèòü íàñòðîéêè ïðèíòåðà è ïå÷àòè\n" "Print Setup" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2672,7 +2679,7 @@ msgstr "" "Ïå÷àòàòü àêòèâíûé äîêóìåíò\n" "Print" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2681,12 +2688,12 @@ msgstr "" "Ïîêàçûâàòü ïîëíûå ñòðàíèöû\n" "Print Preview" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Ïîêàçàòü âñå ñêðûòûå" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2695,32 +2702,32 @@ msgstr "" "Îòêðûòü ôàéë ïðîåêòà\n" "Ôàéë ïðîåêòà (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåèçâåñòíàÿ îøèáêà ïðè îòêðûòèè ôàéëà ïðîåêòà" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåèçâåñòíàÿ îøèáêà ïðè ñîõðàíåíèè ôàéëà ïðîåêòà" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Ôàéë ïðîåêòà" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Ôàéë ïðîåêòà óñïåøíî çàãðóæåí." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Ôàéë ïðîåêòà óñïåøíî ñîõðàíåí." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2729,7 +2736,7 @@ msgstr "" "Ñîõðàíèòü òåêóùèå ïóòè è íàñòðîéêè â ôàéë ïðîåêòà\n" "Ñîõðàíèòü ôàéë ïðîåêòà" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2738,7 +2745,7 @@ msgstr "" "Ïîêàçàòü èíôîðìàöèþ î ïðîãðàììå, íîìåð âåðñèè è êîïèðàéò\n" "About" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2747,9 +2754,6 @@ msgstr "" "Âûéòè èç ïðîãðàììû; Ñïðîñèòü î ñîõðàíåíèè äîêóìåíòîâ\n" "Exit" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2763,11 +2767,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Îòêðûòü ýòîò äîêóìåíò" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2776,7 +2783,7 @@ msgstr "" "Ïåðåêëþ÷èòüñÿ íà ñëåäóþùþþ îêîííóþ ïàíåëü\n" "Next Pane" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2785,7 +2792,7 @@ msgstr "" "Ïåðåêëþ÷èòüñÿ íà ïðåäûäóùþþ îêîííóþ ïàíåëü\n" "Previous Pane" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2794,7 +2801,7 @@ msgstr "" "Îòêðûòü àêòèâíûé äîêóìåíò â íîâîì îêíå\n" "New Window" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2803,7 +2810,7 @@ msgstr "" "Âûñòðîèòü çíà÷êè âíèçó îêíà\n" "Arrange Icons" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2812,7 +2819,7 @@ msgstr "" "Ðàñïîëîæèòü îêíà êàñêàäîì ñ íàëîæåíèåì\n" "Cascade Windows" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2821,7 +2828,7 @@ msgstr "" "Ðàñïîëîæèòü îêíà íåïåðåêðûâàþùåéñÿ ãîðèçîíòàëüíîé ÷åðåïèöåé\n" "Tile Windows" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2830,7 +2837,7 @@ msgstr "" "Ðàñïîëîæèòü îêíà íåïåðåêðûâàþùåéñÿ âåðòèêàëüíîé ÷åðåïèöåé\n" "Tile Windows" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2839,7 +2846,7 @@ msgstr "" "Ðàçäåëèòü àêòèâíîå îêíî íà ïàíåëè\n" "Split" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2848,7 +2855,7 @@ msgstr "" "Î÷èñòèòü âûäåëåíèå\n" "Erase" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2857,7 +2864,7 @@ msgstr "" "Î÷èñòèòü âñå\n" "Erase All" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2866,7 +2873,7 @@ msgstr "" "Ñêîïèðîâàòü â áóôåð îáìåíà\n" "Copy" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2875,7 +2882,7 @@ msgstr "" "Âûðåçàòü è ïîìåñòèòü â áóôåð îáìåíà\n" "Cut" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2884,7 +2891,7 @@ msgstr "" "Íàéòè óêàçàííûé òåêñò\n" "Find" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2893,7 +2900,7 @@ msgstr "" "Âñòàâèòü ñîäåðæèìîå áóôåðà îáìåíà\n" "Paste" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2902,7 +2909,7 @@ msgstr "" "Ïîâòîðèòü ïîñëåäíåå äåéñòâèå\n" "Repeat" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2911,7 +2918,7 @@ msgstr "" "Çàìåíèòü óêàçàííûé òåêñò íà äðóãîé\n" "Replace" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2920,7 +2927,7 @@ msgstr "" "Âûáðàòü âåñü äîêóìåíò\n" "Select All" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2929,7 +2936,7 @@ msgstr "" "Îòìåíèòü ïîñëåäíåå äåéñòâèå\n" "Undo" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2938,7 +2945,7 @@ msgstr "" "Âåðíóòü îòìåíåííîå äåéñòâèå\n" "Redo" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2947,7 +2954,7 @@ msgstr "" "Ïîêàçàòü èëè ñêðûòü ïàíåëü èíñòðóìåíòîâ\n" "Toggle ToolBar" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2956,7 +2963,7 @@ msgstr "" "Ïîêàçàòü èëè ñêðûòü ñòðîêó ñîñòîÿíèé\n" "Toggle StatusBar" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2965,62 +2972,62 @@ msgstr "" "Ïîêàçàòü èëè ñêðûòü ïàíåëü òàáîâ\n" "Toggle TabBar" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Èçìåíèòü ðàçìåð îêíà" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Èçìåíèòü ïîëîæåíèå îêíà" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Ñâåðíóòü îêíî â çíà÷îê" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Ðàñêðûòü îêíî äî ìàêñèìóìà" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Ïåðåêëþ÷èòüñÿ íà ñëåäóþùèé äîêóìåíò" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Ïåðåêëþ÷èòüñÿ íà ïðåäûäóùèé äîêóìåíò" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Çàêðûòü àêòèâíîå îêíî è ñïðîñèòü î ñîõðàíåíèè äîêóìåíòîâ" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Âîññòàíîâèòü íîðìàëüíûå ðàçìåðû îêíà" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Àêòèâèðîâàòü ñïèñîê çàäà÷" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Àêòèâèðîâàòü ýòî îêíî" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3029,7 +3036,7 @@ msgstr "" "Çàêðûòü îêíî ïðåäâàðèòåëüíîãî ïðîñìîòðà\n" "Cancel Preview" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3048,23 +3055,23 @@ msgstr "" "WinMerge.Document\n" "Äîêóìåíò WinMerge" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Ñîõðàíÿòü îðèãèíàëüíûå ñèìâîëû EOL" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Íàæìèòå ëþáóþ êëàâèøó" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Ïðàâûé êëèê íà ïóòè, ÷òîáû ñêîïèðîâàòü" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3073,152 +3080,152 @@ msgstr "" "Ðàçðàáîò÷èêè:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "Ðàçðàáîò÷èêè WinMerge íå ïðåäîñòàâëÿþò ÀÁÑÎËÞÒÍÎ ÍÈÊÀÊÈÕ ÃÀÐÀÍÒÈÉ. Ýòî îòêðûòûé ñîôò è âû ìîæåòå ñâîáîäíî ðàñïðîñòðàíÿòü åãî íà óñëîâèÿõ GPL. Ïîäðîáíîñòè â ìåíþ Ïîìîùü." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Ïðåðâàòü" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "Ïîâ&òîðèòü" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Èãíîðèðîâàòü" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Èãíîðèðîâàòü &âñå" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Äà" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Ä&à äëÿ âñåõ" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Íåò" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Íåò ä&ëÿ âñåõ" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "Ïðî&äîëæèòü" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "Ï&ðîïóñòèòü" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Ïðîï&óñòèòü âñå" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Íå ïîêàçûâàòü &áîëüøå ýòî ñîîáùåíèå" -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Íå çàäàâàòü &áîëüøå ýòîò âîïðîñ" -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Ïîäñâåòêà ñèíòàêñèñà" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Öâåò òåêñòà" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Êîíòðîëü âåðñèé" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "Íà:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "Ñëåâà:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "Íàëåâî:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "Ñïðàâà:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "Íàïðàâî:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Âåðñèÿ %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "Þíèêîä" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Íàñòðîéêè (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Òåïåðü âñå ñîîáùåíèÿ ñíîâà áóäóò îòîáðàæàòüñÿ" -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr " òåêóùåì ñåàíñå ñðàâíåíèÿ ôàéëîâ áûëè ïðîèçâåäåíû èçìåíåíèÿ. Íåêîòîðûå óñòàíîâêè íå âñòóïÿò â ñèëó ïîêà òåêóùèé ñåàíñ ñðàâíåíèÿ íå áóäåò ïåðåçàïóùåí." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Èçìåíåíèÿ äëÿ âûáðàííîãî øðèôòà íå áóäóò ïðèìåíåíû äëÿ îòêðûòûõ îêîí îòëè÷èé." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3229,7 +3236,7 @@ msgstr "" "\n" "Èñïîëüçóéòå çíà÷åíèÿ 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3240,107 +3247,107 @@ msgstr "" "\n" "Íóæíî áóäåò ïåðåçàïóñòèòü WinMerge ïîñëå ñáðîñà íàñòðîåê." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Îòêðûòü" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàììû|*.exe;*.bat;*.cmd|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Ôàéëû ïðîåêòîâ WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ôàéëû êîíôèãóðàöèè (*.ini)|*.ini|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Ôàéëû HTML (*.htm,*.html)|*.htm;*.html|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Ôàéëû XML (*.xml)|*.xml|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Ïîëíûé ïîèñê ïî ñîäåðæèìîìó" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Áûñòðûé ïîèñê ïî ñîäåðæèìîìó" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Ïî ðàçëè÷èÿì â äàòå" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Ïî äàòå èçìåíåíèÿ è ðàçìåðó" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Ïî ðàçìåðó" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Èìÿ" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Ìåñòîïîëîæåíèå" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Ôèëüòðû" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Îïèñàíèå" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Óêàæèòå èìÿ ôàéëà äëÿ íîâîãî ôèëüòðà" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ôàéëû ôèëüòðîâ (*.flt)|*.flt|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3353,7 +3360,7 @@ msgstr "" "Ñêîïèðóéòå ôàéë %1 â ïàïêó ñ ôèëüòðàìè:\n" "%2." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3366,7 +3373,7 @@ msgstr "" "\n" "Óáåäèòåñü, ÷òî ïàïêà ñóùåñòâóåò è äîñòóïíà äëÿ çàïèñè." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3377,7 +3384,7 @@ msgstr "" "\n" "Óêàæèòå ïàïêó ñ ôèëüòðàìè íà âêëàäêå Ñèñòåìà â Íàñòðîéêàõ." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3390,12 +3397,12 @@ msgstr "" "\n" "Âîçìîæíî ôàéë èñïîëüçóåòñÿ." -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Óêàçàòü ôàéë ôèëüòðà" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3406,208 +3413,208 @@ msgstr "" "\n" "Íåâîçìîæíî ñêîïèðîâàòü ôàéë ôèëüòðà â ïàïêó ñ ôèëüòðàìè." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôèëüòð óæå ñóùåñòâóåò. Ïåðåçàïèñàòü?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Ðåãóëÿðíîå âûðàæåíèå" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Ïóòü äî cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Ïóòü äî SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Ðåçóëüòàòû ñðàâíåíèÿ êàòàëîãîâ" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Ñðàâíåíèå ôàéëîâ" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Áåçûìÿííûé ñëåâà" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Áåçûìÿííûé ñïðàâà" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Ñêàíèðîâàíèå ôàéëîâ..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Îòêðûâàþ âûáðàííîå" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Êîïèðîâàíèå Ñëåâà Íàïðàâî" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Êîïèðîâàíèå Ñïðàâà Íàëåâî" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàëåâî" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàïðàâî" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Êîïèðîâàíèå ôàéëîâ..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Óäàëåíèå ôàéëîâ..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Ïåðåìåùåíèå ôàéëîâ..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Ñîçäàåòñÿ îò÷åò..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ñòð: %s Ïîç: %d/%d Çí: %d/%d EOL: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Ñòðîêà: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ñòð: %s Ïîç: %d/%d Çí: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Îáúåäèíåíèå" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Îòëè÷èå %1 èç %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 îòëè÷èé íàéäåíî" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "Íàéäåíî âñåãî îäíî îòëè÷èå" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Ýëåìåíò %1 èç %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Ýëåìåíòîâ: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Âûáåðèòå äâà ÑÓÙÅÑÒÂÓÞÙÈÕ êàòàëîãà èëè ôàéëà äëÿ ñðàâíåíèÿ" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Âûáîð êàòàëîãà" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Âûáåðèòå äëÿ ñðàâíåíèÿ äâà êàòàëîãà èëè ôàéëà" -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Ïóòü ñëåâà óêàçàí íåâåðíî" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Ïóòü ñïðàâà óêàçàí íåâåðíî" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Îáà ïóòè óêàçàíû íåâåðíî" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Âûáåðèòå äâà ôàéëà, ÷òîáû âêëþ÷èòü âûáîð ðàñïàêîâùèêà" -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Íåâîçìîæíî ñðàâíåíèå ôàéëà è êàòàëîãà!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Ôàéë íå íàéäåí: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Ôàéë íå ðàñïàêîâàí: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3620,7 +3627,7 @@ msgstr "" "\n" "îäèíàêîâûå áèíàðíûå ôàéëû" -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3633,7 +3640,7 @@ msgstr "" "\n" "îòëè÷àþùèåñÿ áèíàðíûå ôàéëû" -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3644,7 +3651,7 @@ msgstr "" "\n" "ÿâëÿåòñÿ áèíàðíûì ôàéëîì. Íåâîçìîæíî ñðàâíåíèå áèíàðíûõ è òåêñòîâûõ ôàéëîâ." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3657,37 +3664,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Ñîõðàíèòü êàê..." -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Ñîõðàíèòü èçìåíåíèÿ â %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Îøèáêà ïðîâåðêè âîçìîæíîñòè çàïèñè â óêàçàííîå ìåñòî" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Îøèáêà ñîçäàíèÿ ðåçåðâíîé êîïèè" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3700,7 +3707,7 @@ msgstr "" "\n" "Ïðîäîëæèòü â ëþáîì ñëó÷àå?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3717,7 +3724,7 @@ msgstr "" "\t-èñïîëüçîâàòü äðóãîå èìÿ ôàéëà (Íàæìèòå Ok)\n" "\t-îòìåíèòü òåêóùóþ îïåðàöèþ (Íàæìèòå Îòìåíà)?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3732,7 +3739,7 @@ msgstr "" "\n" "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3747,7 +3754,7 @@ msgstr "" "\n" "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3762,14 +3769,14 @@ msgstr "" "\n" "Ïåðåçàïèñàòü èçìåíåííûé ôàéë?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "%1 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3784,17 +3791,17 @@ msgstr "" "\n" "Åñëè âû õîòèòå îáíîâèòü ôàéëû, òî çàêðîéòå òåêóùåå ñðàâíåíèå è çàãðóçèòå ôàéëû ñíîâà." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..." -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..." -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3805,42 +3812,42 @@ msgstr "" "\n" "Îáíîâèòå äîêóìåíòû ïåðåä ïðîäîëæåíèåì." -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "×òîáû ïðîäîëæèòü, Âû äîëæíû óêàçàòü ïóòü ê ïðîåêòó SourceSafe (íàïðèìåð: $/MyProject)" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Ïîëó÷àåì ôàéëû èç VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåìà êîíòðîëÿ âåðñèé âåðíóëà îøèáêó ïðè ïîïûòêå âçÿòü ôàéë ïîä êîíòðîëü. Íåò âîçìîæíîñòè ïðîäîëæàòü..." -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Îøèáêà âûïîëíåíèÿ ñèñòåìíîé êîìàíäû Ñèñòåìû êîíòðîëÿ âåðñèé." -#: Merge.rc:2107 +#: Merge.rc:2110 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ðàáî÷àÿ ïàïêà VSS è ìåñòîïîëîæåíèå òåêóùåãî ôàéëà íå ñîâïàäàþò. Ïðîäîëæèòü ?" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Íå íàéäåíà áàçà äàííûõ VSS!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Îøèáêà VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3851,7 +3858,7 @@ msgstr "" " Ïðîâåðüòå êîíôèãóðàöèþ.\n" " Ñäåëàòü îòêàò?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3860,179 +3867,179 @@ msgstr "" "VSS âåðíóëà îøèáêó ïðè ïîïûòêå îòêàòà èçìåíåíèé.\n" " Ïðîâåðüòå êîíôèãóðàöèþ. " -#: Merge.rc:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Íåò" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìëàäøå, ÷åì 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 è âûøå)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Ðàçáèâàòü ïî íåâèäèìûì" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ðàçáèâàòü ïî íåâèäèìûì è çíàêàì ïóíêòóàöèè" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Óäàëèòü âûáðàííûé ýëåìåíò ñëåâà" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Óäàëèòü âûáðàííûé ýëåìåíò ñïðàâà" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Óäàëèòü âûáðàííûå ýëåìåíòû ñ îáîèõ ñòîðîí" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ñêðûòü âûáðàííûå ýëåìåíòû (áûñòðûé ôèëüòð)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Ïåðåèìåíîâàòü âûáðàííûå ýëåìåíòû íà îáîèõ ñòîðîíàõ" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Ñêîïèðîâàòü íà ëåâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Ñêîïèðîâàòü íà ïðàâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Ñïðàâà íàëåâî (%1 èç %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Ñëåâà íàïðàâî (%1 èç %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Ñëåâà íà... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Ñïðàâà íà... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Ñëåâà íà... (%1 èç %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Ñïðàâà íà... (%1 èç %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Ñëåâà (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Óäàëèòü %1 èç %2 âûáðàííûõ ýëåìåíòîâ ñ ïðàâîé ñòîðîíû" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Óäàëèòü ñ îáåèõ ñòîðîí %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Ñëåâà (%1 èç %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Ñïðàâà (%1 èç %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Âìåñòå (%1 èç %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Âûáåðèòå ïàïêó íàçíà÷åíèÿ" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Ëåâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Ïðàâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ôàéëîâ îáðàáîòàíî)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 èç %2 ôàéëîâ îáðàáîòàíî)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñëåâà ?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñïðàâà ?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4047,17 +4054,17 @@ msgstr "" "â\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Âû óâåðåíû, ÷òî õîòèòå óäàëèòü %1 èç %2 âûáðàííûõ ýëåìåíòîâ ?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4068,7 +4075,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4079,17 +4086,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü %d ýëåìåíòîâ:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4108,458 +4115,458 @@ msgstr "" "\n" "Îáíîâèòå ñðàâíåíèå." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Îòêðûòü ôàéë ñëåâà" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Îòêðûòü ôàéë ñëåâà âî âíåøíåì ðåäàêòîðå" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Îòêðûòü ôàéë ñëåâà ñ ïîìîùüþ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Îòêðûòü ôàéë ñïðàâà" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Îòêðûòü ôàéë ñïðàâà âî âíåøíåì ðåäàêòîðå" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Îòêðûòü ôàéë ñïðàâà ñ ïîìîùüþ..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íåâîçìîæíî âûïîëíèòü %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Íåèçâåñòíîå ðàñøèðåíèå äëÿ âíåøíåãî ðåäàêòîðà: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ â áóôåð îáìåíà" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ èç ëåâîé ÷àñòè â áóôåð îáìåíà" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ èç ïðàâîé ÷àñòè â áóôåð îáìåíà" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ ñ îáîèõ ïàíåëåé â áóôåð îáìåíà" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Íåèçâåñòíûé ôîðìàò àðõèâà" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ ëåâîé ñòîðîíû" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ ïðàâîé ñòîðîíû" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ îáîèõ ñòîðîí" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Çààðõèâèðîâàòü ïðîèçâîëüíûå ýëåìåíòû ñ îáîèõ ñòîðîí" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Ïåðåìåñòèòü âûáðàííûå ñëåâà ôàéëû â äðóãóþ ïàïêó" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Ïåðåìåñòèòü âûáðàííûå ñïðàâà ôàéëû â äðóãóþ ïàïêó" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Èìÿ ôàéëà" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Êàòàëîã" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Ðåçóëüòàò ñðàâíåíèÿ" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Äàòà Ñëåâà" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Äàòà Ñïðàâà" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Ðàñøèðåíèå" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Ðàçìåð ñëåâà" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Ðàçìåð ñïðàâà" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Ðàçìåð ñïðàâà (ñîêð.)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Ðàçìåð ñëåâà (ñîêð.)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Áîëåå íîâûé ôàéë" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Âåðñèÿ ôàéëà ñëåâà" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Âåðñèÿ ôàéëà ñïðàâà" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Óïðîùåííûé ðåçóëüòàò" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòû ôàéëà ñëåâà" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòû ôàéëà ñïðàâà" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Ëåâûé EOL" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Ïðàâûé EOL" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Êîäèðîâàíèå ôàéëà ñëåâà" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Èãíîð. îòëè÷èÿ" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Îòëè÷èÿ" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Äâîè÷íûé" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Íåâîçìîæíî ñðàâíèòü ôàéëû" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Ñðàâíåíèå ïðåðâàíî" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Ôàéë ïðîïóùåí" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Êàòàëîã ïðîïóùåí" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Òîëüêî ñëåâà: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Òîëüêî ñïðàâà: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíûå ôàéëû íå èìåþò îòëè÷èé" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Áèíàðíûå ôàéëû îòëè÷àþòñÿ" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Ôàéëû îòëè÷àþòñÿ" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Òîëüêî ñëåâà" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Òîëüêî ñïðàâà" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "Îøèáêà" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîøëî âðåìåíè: %ld ìñ" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "Âûáðàí 1 ýëåìåíò" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "Âûáðàíî ýëåìåíòîâ: %1" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Èìÿ ôàéëà èëè êàòàëîãà" -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìåíà ïîäïàïîê, åñëè ïîäïàïêè âêëþ÷åíû" -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëüòàò ñðàâíåíèÿ, äëèííàÿ ôîðìà." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñëåâà" -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Ðàñøèðåíèå ôàéëà" -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Ðàçìåð ôàéëà ñëåâà â áàéòàõ" -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Ðàçìåð ôàéëà ñïðàâà â áàéòàõ" -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Ðàçìåð ëåâîãî ôàéëà (ñîêð.)" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Ðàçìåð ïðàâîãî ôàéëà (ñîêð.)" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà" -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçàòü ñ êàêîé èç ñòîðîí äàòà èçìåíåíèÿ ôàéëà íîâåå" -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñèÿ ôàéëà ñëåâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñèÿ ôàéëà ñïðàâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Ðåçóëüòàò áûñòðîãî ñðàâíåíèÿ" -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòû ôàéëà ñëåâà" -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòû ôàéëà ñïðàâà" -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ëåâîãî ôàéëà" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ïðàâîãî ôàéëà" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Êîäèðîâàíèå ôàéëà ñëåâà" -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà" -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Êîëè÷åñòâî èãíîðèðîâàííûõ îòëè÷èé â ôàéëå. Ýòè îòëè÷èÿ áûëè èãíîðèðîâàííû WinMerge è íå ìîãóò áûòü îáðàáîòàíû." -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Êîëè÷åñòâî îòëè÷èé â ôàéëå. Ýòî ÷èñëî íå âêëþ÷àåò â ñåáÿ èãíîðèðîâàííûå îòëè÷èÿ." -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàçàòü çâåçäî÷êó (*) åñëè ôàéë áèíàðíûé." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Ñðàâíèâàíèå %1 ñ %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè çàïÿòûìè" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè òàáóëÿòîðàìè" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "Ïðîñòîé HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "Ïðîñòîé XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéë îò÷åòà óæå ñóùåñòâóåò. Ïåðåçàïèñàòü??" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4568,47 +4575,47 @@ msgstr "" "Îøèáêà ïðè ñîçäàíèè îò÷åòà:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Îò÷åò óñïåøíî ñîçäàí" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Íà îáîèõ ïàíåëÿõ îòêðûò îäèí è òîò æå ôàéë" -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Âûáðàííûå ôàéëû íå èìåþò îòëè÷èé" -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Âûáðàííàÿ ïàïêà ñóùåñòâóåò òîëüêî íà äðóãîé ñòîðîíå è ïîýòîìó íå ìîæåò áûòü îòêðûòà." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïðè ñðàâíåíèè ôàéëîâ ïðîèçîøëà îøèáêà." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Áèíàðíûå ôàéëû íå ìîãóò áûòü ñðàâíåíû âèçóàëüíî" -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Âðåìåííûå ôàéëû íå ìîãóò áûòü ñîçäàíû. Ïðîâåðüòå íàñòðîéêè ïóòåé äëÿ âðåìåííûõ ôàéëîâ" -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Ôàéëû êàòàëîãîâ íå ìîãóò áûòü ñðàâíåíû âèçóàëüíî" -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4623,7 +4630,7 @@ msgstr "" "\n" "Âíèìàíèå: Åñëè âàñ íå èíòåðåñóþò ðàçëè÷èÿ â EOL, óñòàíîâèòå îïöèþ 'Èãíîðèðîâàòü ðàçëè÷èÿ â EOL' íà âêëàäêå Ñðàâíåíèå â Íàñòðîéêàõ." -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4634,22 +4641,22 @@ msgstr "" "Ñ òåêóùèìè íàñòðîéêàìè, îíè áóäóò ïðåîáðàçîâàíû êî ãëàâíîìó òèïó.\n" " Õîòèòå ëè âû èçìåíèòü âàøè íàñòðîéêè òàê, ÷òîáû ñîõðàíèòü ðàçëè÷íûå EOL ?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Îøèáêà ïðèìåíåíèÿ prediffer '%2' ê ôàéëó '%1'. Ýòîò prediffer äàëåå ïðèìåíÿòüñÿ íå áóäåò." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Íåâîçìîæíî îòêðûòü âûáðàííóþ ïàïêó." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íåâîçìîæíî îòîáðàçèòü áèíàðíûé ôàéë â ðåäàêòîðå." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4660,132 +4667,132 @@ msgstr "" "Êàæäûé èç ôàéëîâ ìîæåò áûòü îòîáðàæåí â ñâîåé êîäèðîâêå, íî èõ ñëèÿíèå èëè êîïèðîâàíèå ìîæåò ïîâðåäèòü èíôîðìàöèþ.\n" "Îòîáðàçèòü îáà ôàéëà â ñèñòåìíîé êîäèðîâêå (ðåêîìåíäóåòñÿ)?" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Âíèìàíèå: Ôàéëû â ðàçëè÷íûõ êîäèðîâêàõ, ëåâûé=%s, ïðàâûé=%s. Èíôîðìàöèÿ ìîæåò áûòü ïîâðåæäåíà." -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Èíôîðìàöèÿ ïîòåðÿíà èç-çà îøèáî÷íîé êîäèðîâêè: îáà ôàéëà" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Èíôîðìàöèÿ ïîòåðÿíà èç-çà îøèáî÷íîé êîäèðîâêè: ïðàâûé ôàéë" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Èíôîðìàöèÿ ïîòåðÿíà èç-çà îøèáî÷íîé êîäèðîâêè: ëåâûé ôàéë" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Íåò îòëè÷èé" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Ñòðîêà îòëè÷èé" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåíåíî %1 ñòðîê." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íåâîçìîæíî íàéòè ñòðîêó \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Ñêîïèðîâàòü ïîëíûé ïóòü" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Ñêîïèðîâàòü èìÿ ôàéëà" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Ìåñòîïîëîæåíèÿ" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Îòëè÷èÿ" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Ïàò÷ óñïåøíî çàïèñàí." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ïàò÷ óæå ñóùåñòâóåò. Õîòèòå ïåðåçàïèñàòü åãî ?" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 ôàéëîâ âûáðàíî]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Íîðìàëüíûé" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Óíèôèöèðîâàííûé" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Íåò âîçìîæíîñòè çàïèñàòü â ôàéë %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Óêàçàííûé ïóòü äëÿ âûâîäà íå ÿâëÿåòñÿ àáñîëþòíûì: %1" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Óêàçàòü âûõîäíîé ôàéë" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç áèíàðíûõ ôàéëîâ" -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç êàòàëîãîâ" -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4796,17 +4803,17 @@ msgstr "" "\n" "Ñîçäàíèå ïàò÷à òðåáóåò ÷òîáû â ôàéëàõ íå áûëî íåñîõðàíåííûõ èçìåíåíèé" -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Ïàïêà íå ñóùåñòâóåò" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Òåêóùèå ðåçóëüòàòû ñðàâíåíèÿ êàòàëîãîâ áóäóò î÷èùåíû." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4818,7 +4825,7 @@ msgstr "" "Íå íàéäåíû âñå íåîáõîäèìûå êîìïîíåíòû (7-zip è/èëè Merge7z*.dll) . \n" "Ïîñìîòðèòå èíñòðóêöèþ, ÷òî áû óçíàòü áîëüøå ïðî ïîääåðæêó àðõèâîâ è êàê åå âêëþ÷èòü." -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4827,7 +4834,7 @@ msgstr "" "\n" "Âíèìàíèå: Èíòåãðàöèÿ ñ 7-Zip îòêëþ÷åíà â íàñòðîéêàõ WinMerge." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4836,37 +4843,37 @@ msgstr "" "\n" "Âíèìàíèå: Çàäåéñòâîâàí òîëüêî ëîêàëüíûé ìîäóëü 7-Zip." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Âûáðàòü ôàéë äëÿ ýêñïîðòà" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Âûáðàòü ôàéë äëÿ èìïîðòà" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Îïöèè, èìïîðòèðîâàííûå èç ôàéëà." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Îïöèè, ýêñïîðòèðóåìûå â ôàéë." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Îøèáêà èìïîðòà îïöèé èç ôàéëà." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Îøèáêà ýêñïîðòà îïöèé â ôàéë." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4877,1098 +4884,1098 @@ msgstr "" "\n" "Ïðîäîëæèòü?" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Îøèáêà â ðåãóëÿðíîì âûðàæåíèè" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Ñîâïàäåíèé íåò" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Íåâåðíîå ðåãóëÿðíîå âûðàæåíèå" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Íåâåðíûé ñèìâîë îáúåäèíåíèÿ" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Íåâåðíîå èìÿ ñèìâîëüíîãî êëàññà" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Çàìûêàþùèé îáðàòíûé ñëýø" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Íåâåðíàÿ îáðàòíàÿ ññûëêà" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Íå èìåþùèå ïàðó [ èëè [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Íå èìåþùèå ïàðó ( èëè \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Íå èìåþùèå ïàðó \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Íåâåðíîå ñîäåðæèìîå \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Íåâåðíîå îêîí÷àíèå äèàïàçîíà" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Íå õâàòàåò ïàìÿòè" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Íåâåðíîå ïðåäøåñòâóþùåå ðåãóëÿðíîå âûðàæåíèå" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Íåîæèäàííîå îêîí÷àíèå ðåãóëÿðíîãî âûðàæåíèÿ" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Ñëèøêîì áîëüøîå ðåãóëÿðíîå âûðàæåíèå" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Íå èìåþùèå ïàðó ) èëè \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "àôðèêààíñ" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "àëáàíñêèé" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "àðàáñêèé (Saudi Arabian)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "àðàáñêèé (Iraq)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "àðàáñêèé (Egyptian)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "àðàáñêèé (Libyan)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "àðàáñêèé (Algerian)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "àðàáñêèé (Moroccan)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "àðàáñêèé (Tunisian)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "àðàáñêèé (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "àðàáñêèé (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "àðàáñêèé (Syrian)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "àðàáñêèé (Jordan)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "àðàáñêèé (Lebanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "àðàáñêèé (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "àðàáñêèé (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "àðàáñêèé (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "àðàáñêèé (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "àðìÿíñêèé" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "àçåðè (Latin)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "àçåðè (Cyrillic)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "áàñêñêèé" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "áåëàðóññêèé" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "áîëãàðñêèé" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "êàòàëîíñêèé" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "êèòàéñêèé (Traditional)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "êèòàéñêèé (Simplified)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "êèòàéñêèé (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "êèòàéñêèé (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "êèòàéñêèé (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "õîðâàòñêèé" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "÷åøñêèé" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "äàòñêèé" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "ãîëàíäñêèé" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "ãîëàíäñêèé (Belgium)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "àíãëèéñêèé (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "àíãëèéñêèé (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "àíãëèéñêèé (Australian)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "àíãëèéñêèé (Canadian)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "àíãëèéñêèé (New Zealand)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "àíãëèéñêèé (Irish)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "àíãëèéñêèé (So. African)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "àíãëèéñêèé (Jamaican)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "àíãëèéñêèé (Caribbean)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "àíãëèéñêèé (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "àíãëèéñêèé (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "àíãëèéñêèé (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "àíãëèéñêèé (Philippines)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "ýñòîíñêèé" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "ôàðåðñêèé" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "ôàðñè" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "ôèíñêèé" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "ôðàíöóçñêèé" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "ôðàíöóçñêèé (Belgique)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "ôðàíöóçñêèé (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "ôðàíöóçñêèé (Switzerland)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "ôðàíöóçñêèé (Luxembourg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "ôðàíöóçñêèé (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "ãðóçèíñêèé" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "íåìåöêèé (Germany)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "íåìåöêèé (Switzerland)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "íåìåöêèé (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "íåìåöêèé (Luxembourg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "íåìåöêèé (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "ãðå÷åñêèé" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "èâðèò" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "õèíäè" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "âåíãåðñêèé" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "èñëàíäñêèé" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Èíäîíåçèéñêèé" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "èòàëüÿíñêèé" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "èòàëüÿíñêèé (Swiss)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "ÿïîíñêèé" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "êàøìèðñêèé (India)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "êàçàõñêèé" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "êîðåéñêèé" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "êîðåéñêèé (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "ëàòûøñêèé" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "ëèòîâñêèé" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "ìàëàéñêèé (Malaysian)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "ìàëàéñêèé (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "ìàíèïóðè" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "íîðâåæñêèé (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "íîðâåæñêèé (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "ïîëüñêèé" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "ïîðòóãàëüñêèé" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "ïîðòóãàëüñêèé (Brazil)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "ðóìûíñêèé" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "ðóññêèé (Russian)" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "ñàíñêðèò" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "cåðáñêèé (Latin)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "cåðáñêèé (Cyrillic)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "õèíäè" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "ñëîâàöêèé" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "ñëîâåíñêèé" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "èñïàíñêèé" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "èñïàíñêèé (Mexican)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "èñïàíñêèé (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "èñïàíñêèé (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "èñïàíñêèé (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "èñïàíñêèé (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "èñïàíñêèé (Dominican)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "èñïàíñêèé (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "èñïàíñêèé (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "èñïàíñêèé (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "èñïàíñêèé (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "èñïàíñêèé (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "èñïàíñêèé (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "èñïàíñêèé (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "èñïàíñêèé (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "èñïàíñêèé (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "èñïàíñêèé (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "èñïàíñêèé (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "èñïàíñêèé (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "èñïàíñêèé (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "ñóàõèëè (Kenya)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "øâåäñêèé" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "øâåäñêèé (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "òàìèë" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "òàòàðñêèé (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "òàéëàíäñêèé" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "òóðåöêèé" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "óêðàèíñêèé" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "óðäó (Pakistan)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "óðäó (India)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "óçáåêñêèé (Latin)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "óçáåêñêèé (Cyrillic)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "âüåòíàìñêèé" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Çàïàäíî-åâðîïåéñêèé" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Âîñòî÷íî-åâðîïåéñêèé" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Âîñòî÷íî-Àçèàòñêèé" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "ÞÂ- & ÞÇ- Àçèàòñêèé" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Öåíòðàëüíî-åâðîïåéñêèé" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Íå ïðèìåíèìî" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Ñîîòâåòñòâóåò ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Ñîîòâåòñòâóåò ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Ñîîòâåòñòâóåò ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Ñîîòâåòñòâóåò ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Ñîîòâåòñòâóåò ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Ñìåøàííûé" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " Á" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "Êá" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "Ìá" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "Ãá" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "Òá" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "Ïá" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Ñîõðàíèòü ôàéë ñëåâà" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Ñîõðàíèòü ôàéë ñïðàâà" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Ñìåíèòü ñòàòóñ 'òîëüêî äëÿ ÷òåíèÿ' ôàéëà/ïàïêè ñëåâà" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Ñìåíèòü ñòàòóñ 'òîëüêî äëÿ ÷òåíèÿ' ôàéëà/ïàïêè ñïðàâà" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Ïðåîáðàçîâàòü EOL ê ñòàíäàðòó DOS" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Ïðåîáðàçîâàòü EOL ê ñòàíäàðòó UNIX" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Ïðåîáðàçîâàòü EOL ê ñòàíäàðòó MAC" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Ïåðåêëþ÷åíèå ìåæäó ðåæèìàìè ðåäàêòèðîâàíèÿ è ñëèÿíèÿ" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5977,12 +5984,12 @@ msgstr "" "Ïðîñìîòðåòü è îòðåäàêòèðîâàòü êîäèðîâêó\n" "File encoding properties" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5991,7 +5998,7 @@ msgstr "" "Âûäåëèòü îòëè÷èå â òåêóùåé ñòðîêå\n" "Difference in the Current Line" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6000,7 +6007,7 @@ msgstr "" "Ïåðåéòè íà ñòðîêó èëè îòëè÷èå\n" "Go to (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6009,7 +6016,7 @@ msgstr "" "Óñòàíîâèòü ïðîãðàììíûå íàñòðîéêè\n" "Íàñòðîéêè" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6018,37 +6025,37 @@ msgstr "" "Îáíîâèòü ýêðàí\n" "Refresh (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Ñêîïèðîâàòü âûáðàííûå ñòðîêè â áóôåð îáìåíà, äîáàâëÿÿ â íà÷àëå ñòðîêè åå íîìåð" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Îáíîâèòü âûáðàííûå ýëåìåíòû" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Çàêëàäêà" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Ïåðåéòè ê ñëåäóþùåé çàêëàäêå" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Ïåðåéòè ê ïðåäûäóùåé çàêëàäêå" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Óäàëèòü âñå çàêëàäêè" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6057,7 +6064,7 @@ msgstr "" "Ïîêàçûâàòü îäèíàêîâûå\n" "Show Identical Items" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6066,7 +6073,7 @@ msgstr "" "Ïîêàçûâàòü ðàçëè÷àþùèåñÿ\n" "Show Different Items" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6075,7 +6082,7 @@ msgstr "" "Ïîêàçûâàòü ïðèñóòñòâóþùèå òîëüêî ñëåâà\n" "Show Left Unique Items" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6084,7 +6091,7 @@ msgstr "" "Ïîêàçûâàòü ïðèñóòñòâóþùèå òîëüêî ñïðàâà\n" "Show Right Unique Items" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6093,7 +6100,7 @@ msgstr "" "Ïîêàçûâàòü áèíàðíûå ôàéëû\n" "Show Binary Files" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6102,7 +6109,7 @@ msgstr "" "Ïîêàçûâàòü ïðîïóùåííûå\n" "Show Skipped Items" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6111,7 +6118,7 @@ msgstr "" "Âûáðàòü øðèôò äëÿ îòîáðàæåíèÿ îòëè÷èé\n" "Select Diff Font" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6120,27 +6127,27 @@ msgstr "" "Èñïîëüçîâàòü ñèñòåìíûé øðèôò ïî óìîë÷àíèþ äëÿ îòîáðàæåíèÿ îòëè÷èé \n" "Default Font" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Ïîêàçûâàòü íåâèäèìûå çíàêè ðàçìåòêè" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Ïåðåêëþ÷èòü ïàíåëü îòëè÷èé" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Ïàíåëü ëîêàöèé ïîêàçûâàåò ïîëíóþ êàðòèíó îòëè÷èé ìåæäó ôàéëàìè" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Ïîêàçàòü äèàëîã ñðàâíåíèÿ ñòàòèñòèê ïàïîê" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6149,7 +6156,7 @@ msgstr "" "Âûáîð ÿçûêà ïîëüçîâàòåëÿ\n" "Language" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6158,12 +6165,12 @@ msgstr "" "Âûäåëèòü îòëè÷èÿ â ñòðîêàõ ðàçíûìè öâåòàìè\n" "Show Line Diff" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Ïîìåíÿòü ïàíåëè ìåñòàìè" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6172,7 +6179,7 @@ msgstr "" "Ïîêàçûâàòü íîìåðà ñòðîê\n" "Show Line Numbers" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6181,7 +6188,7 @@ msgstr "" "Âêëþ÷èòü ïåðåíîñ ñòðîê\n" "Wrap Lines" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6190,17 +6197,17 @@ msgstr "" "Ïîêàçàòü ïîëÿ íà îáåèõ ïàíåëÿõ\n" "Show Selection Margins" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6209,7 +6216,7 @@ msgstr "" "Óñòàíîâèòü íà ïðåäûäóùåå îòëè÷èå\n" "Prev Diff (Alt Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6218,7 +6225,7 @@ msgstr "" "Óñòàíîâèòü íà ñëåäóþùåå îòëè÷èå\n" "Next Diff (Alt Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6227,7 +6234,7 @@ msgstr "" "Ïåðåéòè íà ïåðâîå îòëè÷èå\n" "First Diff (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6236,7 +6243,7 @@ msgstr "" "Ïåðåéòè íà òåêóùåå îòëè÷èå\n" "Current Diff (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6245,7 +6252,7 @@ msgstr "" "Ïåðåéòè íà ïîñëåäíåå îòëè÷èå\n" "Last Diff (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6254,7 +6261,7 @@ msgstr "" "Ñêîïèðîâàòü âûáðàííûé òåêñò â ôàéë ñïðàâà\n" "Copy Right (Alt Right)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6263,7 +6270,7 @@ msgstr "" "Ñêîïèðîâàòü âûáðàííûé òåêñò â ôàéë ñëåâà\n" "Copy Left (Alt Left)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6272,7 +6279,7 @@ msgstr "" "Ñêîïèðîâàòü îòëè÷èå íà ëåâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\n" "Copy Right and advance (Ctrl Alt Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6281,7 +6288,7 @@ msgstr "" "Ñêîïèðîâàòü îòëè÷èå íà ïðàâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\n" "Copy Left and advance (Ctrl Alt Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6290,7 +6297,7 @@ msgstr "" "Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñïðàâà\n" "All Right" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6299,72 +6306,72 @@ msgstr "" "Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñëåâà\n" "All Left" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Óäàëèòü âûáðàííûå ýëåìåíòû èç îáîèõ êàòàëîãîâ" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Ñðàâíèòü âûäåëåííûå ýëåìåíòû (ñðàâíèòü ïåðâûé ýë-ò, åñëè âûäåëåíî áîëåå îäíîãî)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Âûáðàòü è ïåðåñòàâèòü ìåñòàìè êîëîíêè ñðàâíåíèÿ êàòàëîãîâ" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Ñîçäàòü ïàò÷" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Âûáîð è ðåäàêòèðîâàíèå ôèëüòðîâ" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Ñîçäàòü îò÷åò èç ðåçóëüòàòîâ ñðàâíåíèÿ" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Âûáðàííûé ïîëüçîâàòåëåì ðàñïàêîâùèê (íå äåéñòâóåò ïðè ñðàâíåíèè êàòàëîãîâ)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Àâòîìàòè÷åñêèé ïîäîáîð ðàñïàêîâùèêà (óêàæèòå ðàñøèðåíèå õîòÿ áû ó îäíîãî èç ôàéëîâ)" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Âûáåðèòå ðàñïàêîâùèê äëÿ ðåäàêòèðîâàíèÿ ýòîãî ôàéëà" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Áåç ïðåäñðàâíåíèÿ (normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Ñîâåòóåìûå ïëàãèíû" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Äðóãèå ïëàãèíû" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Âûãðóçèòü âñå ïëàãèíû è çàãðóçèòü èõ ñíîâà (äëÿ ðàçðàáîò÷èêîâ)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6373,12 +6380,12 @@ msgstr "" "Àêòèâèðîâàòü ñëåäóþùèé âèäèìûé ôàéë\n" "Active next File" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Çàêðûòü âñå îòêðûòûå îêíà" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6387,22 +6394,22 @@ msgstr "" "Ïîêàçàòü ñïðàâêó ïîëüçîâàòåëÿ WinMerge\n" "Help" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Âûâåñòè èíôîðìàöèþ î òåêóùåé âåðñèè WinMerge è íàñòðîéêàõ â òåêñòîâûé ôàéë" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Ïîêàçàòü ëèöåíçèþ GNU public" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "×àñòíûé áèëä: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6411,7 +6418,7 @@ msgstr "" "Îòêðûâàåò èíäåêñ ïîìîùè WinMerge\n" "Help Index" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6420,267 +6427,272 @@ msgstr "" "Îòêðûâàåò ïîèñê ïî ïîìîùè WinMerge\n" "Help Search" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Íàñòðîéêè ïëàãèíà" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Ïðåäñðàâíåíèå îòñóòñòâóåò" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Åñëè âîçìîæíî, òî ïðåäñðàâíåíèå áóäåò ïðîèçâåäåíî" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå íàéäåí - .sct ñêðèïòû îòêëþ÷åíû" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "<Íåò>" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "<Àâòîìàòè÷åñêè>" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Îòêðûòü ôàéë çàðåãèñòðèðîâàííûì ïðèëîæåíèåì" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Îòêðûòü ôàéë âíåøíèì ðåäàêòîðîì" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Îòêðûòü ôàéë âûáðàííîé ïðîãðàììîé" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Íå îòîáðàæàòü ïåðåìåùåííûå áëîêè" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Îòîáðàæàòü âñå ïåðåìåùåííûå áëîêè" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Îòîáðàæàòü ïåðåìåùåííûå áëîêè äëÿ òåêóùåãî îòëè÷èÿ" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Ïåðåéòè ê îòëè÷èþ ïîä êóðñîðîì" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Ïåðåéòè ê &îòëè÷èþ %1 èç %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "Ïåðåéòè ê &ñòðîêå %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Îòêëþ÷åíî" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Êàê íà äèñêå" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Êàê â ñïèñêå íåäàâíèõ äîêóìåíòîâ" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "Áåéñèê" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "Ôîðòðàí" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "Ïàñêàëü" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "Ïåðë" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "Ðåñóðñû" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Ñêðûòü ïàíåëü èíñòðóìåíòîâ" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Ìàëåíüêèå çíà÷êè" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Áîëüøèå çíà÷êè" diff --git a/Src/Languages/Slovak.po b/Src/Languages/Slovak.po index ec07dd7da..0767df823 100644 --- a/Src/Languages/Slovak.po +++ b/Src/Languages/Slovak.po @@ -72,7 +72,7 @@ msgstr "V&ystrihn #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Kopírova" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "V&loži" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&Choï na..." @@ -95,43 +95,43 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "®istrovanou aplikáciou" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "&externým editorom" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "èí&m..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Súbor" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Nový\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Otvori...\tCtrl+O" @@ -147,8 +147,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Otvori projekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Uloži &projekt..." @@ -159,1845 +159,1852 @@ msgid "Recent Projects" msgstr "Posledné projekty" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Koniec" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "Úpr&avy" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Nastavenia" #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Poh¾ad" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "&Zvoli písmo..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Použi základné písm&o" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "&Panel nástrojov" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "Ž&iadny" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "&Malý" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Ve¾ký" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "&Stavový riadok" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "Panel &záložiek" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Jazyk..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Nástroje" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtre..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Vytvori záplatu..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Zásuvné moduly" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "&Manuálne rozbalenie" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatické rozbalenie" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Upravova rozba¾ovacím programom" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Znovu naèíta zásuvné moduly" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "&Ladi" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "&Nahra konfiguráciu..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "&Resetova možnosti" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "&Okno" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Zatvori" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Zatvori &všetky" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Zmeni &panel\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Dlaždice &vodorovne" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Dlaždice &zvisle" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Kaskáda" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "Po&moc" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "O&bsah...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "" #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&H¾ada..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "K&onfigurácia..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Podpora a&rchívov vypnutá..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "GNU Public License..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&O aplikácii..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "O&tvori projekt...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "¼&avý len na èítanie" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "&Pravý len na èítanie" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "&Kódovanie súboru" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vybr&a všetko\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Zobrazi &identické položky" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Zobrazi &rozdielne položky" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Zobrazi položky jedineèné &v¾avo" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Zobrazi položky jedineèné vp&ravo" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Zobrazi pres&koèené položky" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Z&obrazi binárne súbory" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Zobrazi &skryté položky" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Štatistika po&rovnania" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Obnovi\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "O&bnovi vybrané\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Zlúèi" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Po&rovna\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nasledujúci rozdiel\tTAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Predchádzajúci rozdiel\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Pr&vý rozdiel\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuány rozdiel\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Posledný &rozdiel\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Zmaza\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Prispôsobi ståpce..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Vystvori &správu..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Uloži\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Uloži ¾&avý" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Uloži" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Uloži &ako..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Uloži &pravý" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Tlaèi..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "Nastavenie S&tránky" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "Náh¾ad p&red tlaèou" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Konvertova konce riadkov na" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "&Zluèovací režim\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Vráti\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Opakova\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "V&ystrihnú\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopírova\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "V&loži\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Oznaèi roz&diel v riadku\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&H¾ada...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Nahradi...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Skripty" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Prázdne >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Rozšírené" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopírova s èíslami riadkov\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Záložky" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Prepnú záložku\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Ïalšia záložka\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Predošlá záložka\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Zmaza všetky záložky" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Choï na...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "&Zobrazi prázdne miesto" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Zobraz&i rozdiely riadkov" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Zobrazi èísla &riadkov" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Zobrazi &okraje" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "&Zalamova riadky" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "&Vymeni panely" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "&Panel s rozdielom" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "&Lokaèný panel" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopírova vpravo a ís ïalej\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopírova v¾avo a ís ïalej\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Kopírova všetko vpravo" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Kopírova všetko v¾avo" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Predspracovanie" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "Porovn&a" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&¼avý s pravým" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "¼a&vý s..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "&Pravý s ¾avým" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "P&avý s..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Presunú" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "¼&avý do..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&pravý do..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Zmaza" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "¼&avý" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Pravý" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Oba" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "Preme&nova" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "&Skry položky" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "&Otvori ¾avý" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "O&tvori pravý" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Skopírova názvy &ciest" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&¼avý (%1 z %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&pravý (%1 z %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Oba (%1 z %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Skopírova názvy &súborov" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "&Zipova" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&¼avý... (%1 of %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&pravý... (%1 of %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Oba... (%1 of %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Rozdiely... (%1 of %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "&Obnovi" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "&Kopírova plnú cestu" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Kopírova názov &súboru" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Nastavenia preprocesora" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Bez preprocesora" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "&Auto preprocesor" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Ch&oï na rozdiel" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Bez presunutých blokov" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Všetky presunuté bloky" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Presunutý blok pre &aktuálny rozdiel" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "O aplikácii" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(Súkromné zostavenie)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Všetky práva vyhradené." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Navštívte www stránku programu WinMerge!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Prispievatelia" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Výber súborov a adresárov..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&¼avý:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Prechádza..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "P&ravý:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "&Prechádza..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "Pr&ípony:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "&Vybra..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "&Rozba¾ovací program:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "&Vybra..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Zahrnú podadresáre" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Zruši" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Pomoc" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Súbory alebo adresáre pre porovnanie" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Databáza:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Používate¾:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Heslo:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Odkaz na Cie¾ový VSS projekt" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Použi na všetky položky" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Uloži ako..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Systém pre spávu verzií" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "Systém pre správu &verzií:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Cesta ku cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Hlavné nastavenia" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatický &skok na prvý rozdiel" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Nezobrazova spúšací banner" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zat&vára okná klávesom ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Automaticky overova cestu v dialógu Otvori" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "Um&ožni beh iba jednej inštancie" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&utomatické dopåòanie v dialógu Otvori:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Povoli viaceré okná pre porovnanie" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Porovnávanie &adresárov" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Porovnávanie &súborov" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Jazyk" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Dostupné jazyky:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "H¾ada" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&H¾ada:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Iba celé &slová" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Rozlišuj &ve¾ké/malé" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "&Regulárny výraz" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "&Nezalamova koniec súboru" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "S&mer h¾adania" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Nahor" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "Na&dol" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Nájdi ïalší" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Nahradi" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Nahradi:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "&Nezalamova koniec súboru" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Nahradi vo" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "Výbere" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "Celom súbore" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "Nahraïi" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Nahraïi všetko" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Komentáre" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "Check in po checkout-e" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Riadkové filtre" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Zapnú riadkové filtre" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulárne výrazy (jeden na riadok):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Uloži" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "Nový" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Upravi" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "Odstráni" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Farby" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Rozdiel:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Rozdiel vo výbere:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Pozadie" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Zmazané" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Ignorovaný rozdiel:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Presunutý:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Výber presunutý:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Rozdiel v slove:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Rozdiel vo vybranom slove:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Predvolené" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Dialóg" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Systém" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Posiela zmazané súbory do koša" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orova èasové rozdiely menšie ako 3 sekundy" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integrácia" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Prida do kontextovej ponuky Prieskumníka" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Zap&nú rozšírenú ponuku" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "Za&hàòa štandardne aj podadresáre" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "&Externý editor:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "Adresár s &filtrami:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Preh¾adáva..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Generátor záplat" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Súbor&1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Súbor&2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Preh¾adáva" -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "&Vymeni navzájom" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "&Rozšíri existujúci súbor" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Výsledok:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "&Formát" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "Š&týl:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Kontext:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "&Netlaèite¾né znaky:" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "&Porovna" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "I&gnorova zmeny" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Ig&norova všetko" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ova prázdne riadky" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "&Zoh¾adòova ve¾kos písmen" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Zahrnú príkazový ria&dok" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Otvori v e&xternom editore" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Zobrazova ståpce" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Vyber rozba¾ovací program" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Rozba¾ovací program:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Zobrazi všetky rozba¾ovacie programy, nekontrolova príponu" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Zoznam prípon:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Popis:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr " Priebeh porovnania adresárov" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Porovnávam položky..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Porovnaných položiek:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Položiek celkom:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Choï na" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "Ch&oï na:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Súbor" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Choï na..." -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "Riad&ok" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Rozdiel" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Choï na" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Porovnávanie" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Netlaèite¾né znaky" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "Porovnáva &netlaèite¾né znaky" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "Ignorova &zmeny v prázdnom mieste" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Ignorova &celé prázdne miesto" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorova prázdne riad&ky" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignorova m&alé/VE¼KÉ" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Ignorova rozdiely v &zakonèení riadkov (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "Zapnú &detekciu pohyblivého bloku" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "&Podobné riadky ako zhodné" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Me&tóda porovnávania súborov:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "&Stop po prvom rozdiele" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Filtrova komentáre" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Zvýrazòovanie syntaxe" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Automatické p&reskenovanie" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "&Zachováva pôvodné zakonèenie riadkov" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulátory" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Nastavenie tabulátorov:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "Vklada tabulátory" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Vklada medzery" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Farebné odlíšenie riadkových rozdielov" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Zobrazova riadkové rozdiely" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "Úroveò &znaku" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "Úroveò &slova:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filtre súborov" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Testova" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Inštalova..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Nový..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Upravova..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Zmaza..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Uloži zmenené súbory?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Súbor na ¾avej strane" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Uloži zmeny" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Zahodi zmeny" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Súbor na pravej strane" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "U&loži zmeny" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Z&ahodi zmeny" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Zahodi všetky" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Kódová stránka" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Predvolená kódová stránka" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2006,32 +2013,32 @@ msgstr "" "Detekova informáciu o kódovej stránke pri týchto súboroch: .html, .rc, .xml \n" "je potrebné reštartova program" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Systémová kódová stránka" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Pod¾a používate¾ského rozhrania WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Vlastná kódová stránka:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - podpora archívov vypnutá" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nedetekoval som verziu 7-Zip (nie je nainštalovaný?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2040,12 +2047,12 @@ msgstr "" "Podpora archívov vyžaduje, aby bol nainštalovaný 7-Zip 3.11 alebo neskorší m inaks\n" "jeho dôležité komponenty budú prekopírované do adresára pre samostatnú (stanalone) prevádzku." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Musí by aj správny zásuvný modul rozhrania (Merge7z*.dll) v ceste." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2054,12 +2061,12 @@ msgstr "" "Prosím, používajte nižšie odporúèanú verziu 7-Zip kým nebudú dostupné zásuvné moduly rozhrania\n" "pre neskoršie verzie." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2068,54 +2075,54 @@ msgstr "" "Požaduje sa zásuvný modul\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Odporúèaná verzia 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "prítomný" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "žiadny" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "chýba" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "samostatné (standalone) komponenty 7-Zip:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "zastaralý" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Zásuvné moduly v ceste:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2124,486 +2131,486 @@ msgstr "" "Viac túto správu &nezobazova.\n" "(You can always recall this message from help menu.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Stiahnutie zásuvného modulu" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Nastavenia" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Kategórie" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Importova..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Exportova..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "K¾úèové slová:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Názvy funkcií:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Komentáre:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Èísla:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operátory:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Reazce:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Preprocesor:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Používate¾ 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Používate¾ 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Správa o porovnaní adresárov" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "&Súbor správy:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Štýl:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopírova do schránky" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Zdie¾aný alebo súkromný filter" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Aký typ filtra chcete vytvori?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, 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:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Súkromný filter (len pre aktuálneho používate¾a)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Podpora archívov" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Podpora archívov vyžaduje nainštalovaný zásuvný modul 7-Zip:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Stiahnu zásuvný modul 7-Zip" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Zapnú podporu archívov" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Použi samostatný (standalone) 7-Zip ak sa dá" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "P&ouži lokálny 7-Zip z adresára WinMerge" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detekova typ archívu z hlavièky súboru" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Štatistika porovnania" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Adresáre:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Súbory:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Odlišné" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binárne:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Jedineèné" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "V¾avo:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Vpravo:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identické" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Celkom:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Zatvori" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Ovplyvòuje" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Ovplyvòuje)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Zvo¾te kódovú stránku pre" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&Naèítanie súboru:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "&Ukladanie súboru:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&Použi pre obe rovnakú kódovú stránku" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "&Použi" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Zruši" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Test filtra" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Testujem filter ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Zadajte testovací reazec:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Názov adresára" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Výsledok:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Zatvori" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&Používa štandardné farby textu" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Vlastné farby textu" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Netlaèite¾né znaky:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Bežný text:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Výber:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Cesty" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "&Len na èítanie" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Len na èít&anie" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Otvori..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Uloži..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Záložné súbory" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Vytvára záložné súbory v:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Vytvára záložné súbory do:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "Adresár &originálneho súboru" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "&Globálny adresár pre zálohy:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Názov záložného súboru:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "&Prida rozšírenie .bak" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "P&rida èasovú známku" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, 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:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "Z¾ava" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "Doprava" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Áno" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "Nie" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041b04e2" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Preložil Ivan Masár" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x41b, 1250" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Pripravený" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2612,7 +2619,7 @@ msgstr "" "Vytvorí prázdny dokument\n" "Nové dokumenty (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2621,7 +2628,7 @@ msgstr "" "Otvorí existujúci dokument\n" "Otvor" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2630,7 +2637,7 @@ msgstr "" "Zatvorí aktívny dokument\n" "Zatvor" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2639,7 +2646,7 @@ msgstr "" "Uloží aktívny dokument\n" "Ulož" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2648,7 +2655,7 @@ msgstr "" "Uloží aktívny dokument pod novým menom\n" "Ulož ako" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2657,7 +2664,7 @@ msgstr "" "Zmení parametre tlaèe\n" "Nastavenie tlaèe" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2666,7 +2673,7 @@ msgstr "" "Zmení tlaèiareò a parametre tlaèe\n" "Nastavenie tlaèiarne" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2675,7 +2682,7 @@ msgstr "" "Vytlaèí aktívny dokument\n" "Tlaè" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2684,12 +2691,12 @@ msgstr "" "Zobrazí náh¾ad pred tlaèou\n" "Náh¾ad pred tlaèou" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Zvidite¾ni všetky skryté položky" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2698,32 +2705,32 @@ msgstr "" "Otvorí súbor projektu\n" "Súbor sprojektu (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznáma chyba pri pokuse otvori súbor projektu" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznáma chyba pri pokuse uloži súbor projektu" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Súbor projektu" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Súbor projektu úspešne naèítaný." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Súbor projektu úspešne uložený." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2732,7 +2739,7 @@ msgstr "" "Uloží aktuálne nastavenia a cesty do súboru projektu\n" "Uloži Súbor projektu" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2741,7 +2748,7 @@ msgstr "" "Zobrazí informácie o programe\n" "O programe" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2750,9 +2757,6 @@ msgstr "" "Ukonèí program s otázkou na uloženie súborov\n" "Koniec" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2766,11 +2770,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Otvorí dokument" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2779,7 +2786,7 @@ msgstr "" "Prepne na ïalšie okno\n" "Ïalšie okno" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2788,7 +2795,7 @@ msgstr "" "Prepne na predchádzajúce okno\n" "Predchádzajúce okno" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2797,7 +2804,7 @@ msgstr "" "Otvorí ïalšie okno s aktuálnym dokumentom\n" "Nové okno" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2806,7 +2813,7 @@ msgstr "" "Usporiada ikony na spodnom okraji okna\n" "Usporiadaj ikony" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2815,7 +2822,7 @@ msgstr "" "Usporiada otvorené okná kaskádovito\n" "Kaskáda" -#: Merge.rc:1773 +#: Merge.rc:1776 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2824,7 +2831,7 @@ msgstr "" "Dlaždice vodorovne\n" "Dlaždice" -#: Merge.rc:1774 +#: Merge.rc:1777 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2833,7 +2840,7 @@ msgstr "" "Dlaždice zvisle\n" "Dlaždice" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2842,7 +2849,7 @@ msgstr "" "Rozdeli aktívne okno\n" "Rozdeli" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2851,7 +2858,7 @@ msgstr "" "Zmaže oznaèené\n" "Zmaza" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2860,7 +2867,7 @@ msgstr "" "Zmaže všetko\n" "Zmaza všetko" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2869,7 +2876,7 @@ msgstr "" "Skopíruje oznaèené do schránky\n" "Kopírova" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2878,7 +2885,7 @@ msgstr "" "Presununie oznaèené do schránky\n" "Vystrihnú" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2887,7 +2894,7 @@ msgstr "" "Vyh¾adá text\n" "Nájdi" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2896,7 +2903,7 @@ msgstr "" "Vloží obsah schránky\n" "Vloži" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2905,7 +2912,7 @@ msgstr "" "Zopakuje poslednú akciu\n" "Opakuj" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2914,7 +2921,7 @@ msgstr "" "Nahradí text\n" "Nahradi" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2923,7 +2930,7 @@ msgstr "" "Oznaèí všetko\n" "Oznaèi všetko" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2932,7 +2939,7 @@ msgstr "" "Vráti poslednú èinnos\n" "Vráti" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2941,7 +2948,7 @@ msgstr "" "Zopakuje poslednú vrátenú èinnos\n" "Opakova" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2950,7 +2957,7 @@ msgstr "" "Zobrazí alebo skryje panel nástrojov\n" "Panel nástrojov" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2959,7 +2966,7 @@ msgstr "" "Zobrazí alebo skryje stavový riadok\n" "Stavový riadok" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2968,62 +2975,62 @@ msgstr "" "Zobrazí alebo skryje panel záložiek\n" "Panel záložiek" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Zmeni ve¾kos okna" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Zmeni pozíciu okna" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Minimalizova okno" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Zväèši okno na pôvodnú ve¾kos" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Prepnú na ïalšie okno" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Prepnú na predchádzajúce okno" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zatvori aktívne okno s možnosou uloženia dokumentov" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Obnovi okná" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Aktivova zoznam úloh" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Aktivova toto okno" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3032,7 +3039,7 @@ msgstr "" "Zatvorí náh¾ad tlaèe\n" "Zruš náh¾ad" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3051,23 +3058,23 @@ msgstr "" "WinMerge.Document\n" "Dokument WinMerge" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Zachova pôvodné zakonèenia riadkov" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Stlaète ¾ubovo¾ný kláves" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Cestu skopírujete po kliknutí pravým tlaèidlom" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3076,152 +3083,152 @@ msgstr "" "Vývojári:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "WinMerge je poskytovaný BEZ AKEJKO¼VEK ZÁRUKY. Toto je slobodný softvér a za istých podmienok ho môžete vo¾ne šíri; pozri podrobnosti v GNU Public License v ponuke Pomocník." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Zruši" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Znova" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignorova" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Ignorova &všetky" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "Á&no" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Áno &pre všetky" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Nie" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Nie pre &všetky" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "Po&kraèova" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "Pre&skoèi" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Preskoèi vš&etky" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Už túto správu nezobrazova." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Už sa túto otázku nepýta." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Farby syntaxe" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Farby textu" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Kontrola verzií" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "Z¾ava:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "Do¾ava:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "Sprava:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "Do¾ava:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Verzia %1 - Slovenský preklad" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Vlastnosti (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Znova sa zobrazujú všetky okná so správami." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Nastali zmeny v aktuálnom súbore. Niektoré nastavenia sa neuplatnia, pokia¾ porovnanie aktuálneho súboru sa nezaène odznova." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Zvolená zmena písma sa neprejaví v práve zobrazených paneloch." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3232,7 +3239,7 @@ msgstr "" "\n" "Použite hodnoty 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3243,107 +3250,107 @@ msgstr "" "\n" "prosím, po resetovaní reštartujte WinMerge." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Otvori" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Všetky súbory (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Všetky súbory (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge projekty (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Súbory s nastavením (*.ini)|*.ini|Všetky súbory (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, 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:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML súbory (*.xml)|*.xml|Všetky súbory (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Plný obsah" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Rýchly obsah" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Dátum zmeny" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Dátum zmeny a ve¾kos" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Ve¾kos" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Názov" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Umiestnenie" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Popis" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Zvo¾te názov súboru pre nový filter" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtre súborov (*.flt)|*.flt|Všetky súbory (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3356,7 +3363,7 @@ msgstr "" "Prosím, skopírujte súbor %1 do adresára WinMerge/Filters :\n" "%2." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3369,7 +3376,7 @@ msgstr "" "\n" "Prosím, uistite sa, že adresár existuje a dá sa doòho zapisova." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3380,7 +3387,7 @@ msgstr "" "\n" "Prosím, vyberte adresár pre filtre v dialógu Nastavienia/Systém." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3393,12 +3400,12 @@ msgstr "" "\n" "Možno je filter len na èítanie?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Nájs súbor filtra, ktorý sa nainštaluje" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3409,208 +3416,208 @@ msgstr "" "\n" "Nepodarilo sa skopírova nový súbor do adresára s filtrami." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter už existuje. Prepísa existujúci filter?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Regulárny výraz" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Cesta ku cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Cesta ku SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Výsledok porovnania adresárov" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Porovnávanie súborov" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Nepomenovaný ¾avý" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Nepomenovaný pravý" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Preh¾adávam súbory..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Otváranie výberu" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Kopírujem ¾avý do pravého" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Kopírujem pravý do ¾avého" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Kopírujem všetko do ¾avého" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Kopírujem všetko do pravého" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Kopírujem súbory..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Mažem súbory..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Presúvam súbory..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Vytváram správu..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Riad: %s Stå: %d/%d Zn: %d/%d EOL: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Riadok: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Riad: %s Stå: %d/%d Zn: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Zlúèi" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Rozdiel %1 z %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "nájdených %1 rozdielov" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "nájdený jeden rozdiel" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "na èítanie" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Položka %1 of %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Položky: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, 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:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Výber adresára" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dva adresáre na porovnanie." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "¼avá cesta je neplatná!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Pravá cesta je neplatná!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Obe cesty sú neplatné!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, 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:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Nemôžem porovna súbor a adresár!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Súbor nenájdený: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Súbor nerozbalený: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3623,7 +3630,7 @@ msgstr "" "\n" "sú identické binárne súbory." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3636,7 +3643,7 @@ msgstr "" "\n" "sú rozdielne binárne súbory." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3647,7 +3654,7 @@ msgstr "" "\n" "je binárny súbor. Nemôžem porovnáva binarny súbor s textovým." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3660,37 +3667,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Uloži ako" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Uloži zmeny do %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Chyba pri zisovaní možnosti zápisu" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Chyba pri zálohovaní súboru" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3703,7 +3710,7 @@ msgstr "" "\n" "Pokraèova napriek tomu?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3720,7 +3727,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:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3735,7 +3742,7 @@ msgstr "" "\n" "Želáte si uloži rozbalenú verziu do iného súboru?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3750,7 +3757,7 @@ msgstr "" "\n" "Želáte si uloži rozbalenú verziu do iného súboru?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3765,7 +3772,7 @@ msgstr "" "\n" "Prepísa zmenený súbor?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3774,7 +3781,7 @@ msgstr "" "%1\n" "je oznaèený len na èítanie. Želáte si prepísa položku len na èítanie?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3789,17 +3796,17 @@ msgstr "" "\n" "Ak chcete obnovi súbory, zatvorte aktuálne porovnávanie súborov a znova naèítajte súbory." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Uloži ¾avý súbor ako" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Uloži pravý súbor ako" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3810,42 +3817,42 @@ msgstr "" "\n" "Obnovte dokumenty, než budete pokraèova." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout súborov z VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Chyba pri spúšaní príkazu zo Systému Verzií (CVS a pod)." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Nebola nájdená databáza VSS!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Chyba VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3856,7 +3863,7 @@ msgstr "" " Prosím, skontrolujte konfiguráciu zvoleného poh¾adu.\n" " Vráti operáciu checkout?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3865,179 +3872,179 @@ 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Žiadny" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menšie ako 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vyššie)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Preruši na netlaèite¾nom znaku" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Preruši na netlaèite¾nom znaku alebo vetnej diakritike" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Kopírova oznaèenú položku do pomenovaného adresára" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopírova oznaèenú položku do vlastného adresára" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Zmaž oznaèené položky v¾avo" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Zmaž oznaèené položky vpravo" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Zmaž oznaèené položky na oboch stranách" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Skry oznaèené položky (filter poèas behu)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Premenova oznaèenú položku na oboch stranách" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Kopíruj do ¾avej strany %1 z %2 vybraných položiek" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Kopíruj do pravej strany %1 z %2 vybraných položiek" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Sprava do¾ava (%1 z %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Z¾ava doprava (%1 z %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Z¾ava... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Sprava... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Z¾ava... (%1 z %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Sprava... (%1 z %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "¼avý (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Zmaž %1 z %2 vybraných položiek z pravej strany" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Zmaza z oboch strán %1 z %2 vybraných položiek" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "¼avý (%1 z %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Pravý (%1 z %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Oba (%1 z %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Vyberte cie¾ový adresár" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "¼avá strana - vyberte cie¾ový adresár:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Pravá strana - vyberte cie¾ový adresár:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ovplyvnených súborov)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 ovplyvnených súborov z %2)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Naozaj chcete skopírova všetky rozdiely do súboru v¾avo?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Naozaj chcete skopírova všetky rozdiely do súboru vpravo?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4052,17 +4059,17 @@ msgstr "" "do\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Naozaj chcete skopírova %1 z %2 vybraných položiek?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Chcete naozaj zmaza %1 z %2 vybraných položiek?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4073,7 +4080,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4084,17 +4091,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Naozaj chcete skopírova:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Naozaj chcete skopírova %d položiek:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4113,458 +4120,458 @@ msgstr "" "\n" "Prosím, obnovte porovnanie." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Otvori ¾avý súbor" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Otvori ¾avý súbor s..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Otvori pravý súbor" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Otvori pravý súbor v externom editore" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Otvori pravý súbor s..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nepodarilo sa spusti externý editor: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Neznáma prípona (external editor): %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Skopírova názvy súborov do schránky" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Skopírova názvy cesty na ¾avej strane do schránky" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Skopírova názvy cesty na pravej strane do schránky" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Skopírova názvy ciest z oboch strán do schránky" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Neznámy formát archívu" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Prida položky z ¾avej strany do archívu" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Prida položky z pravej strany do archívu" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Prida položky z oboch strán do archívu" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Prida rozdielne položky do archívu (obe strany)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Presunú vybraný súbor na ¾avej strane do adresára, ktorý zadám" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Presunú vybraný súbor na pravej strane do adresára, ktorý zadám" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Názov súboru" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Adresár" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Výsledok porovnania" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Dátum v¾avo" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Dátum vpravo" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Prípona" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Ve¾kos v¾avo" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Ve¾kos vpravo" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Ve¾kos vpravo (krátka)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Ve¾kos v¾avo (krátka)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Èas vzniku v¾avo" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Èas vzniku vpravo" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Novší súbor" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Verzia súboru v¾avo" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Verzia súboru vpravo" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Krátky výsledok" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Atribúty v¾avo" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Atribúty vpravo" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Konce riadkov v¾avo" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Konce riadkov vpravo" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Kódovanie v¾avo" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Kódovanie vpravo" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Ignorovaný rozdiel" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Rozdiely" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binárny" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Nemožno porovna súbory" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Položka zrušená" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Súbor preskoèený" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Adresár preskoèený" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Iba v¾avo: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Iba vpravo: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Binárne súbory sú identické" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Binárne súbory sú rozdielne" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Súbory sú rozdielne" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Iba v¾avo" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Iba vpravo" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynulý èas: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "jedna vybraná položka" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 vybraných položiek" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Názov súboru alebo adresára." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Názov podadresára, keï obsahuje aj podadresáre." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Výsledok porovnania, dlhý tvar." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Dátum poslednej zmeny na ¾avej strane." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Dátum poslednej zmeny na pravej strane." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Prípona súboru." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Ve¾kos súboru na ¾avej strane v bajtoch." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Ve¾kos súboru na pravej strane v bajtoch." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Ve¾kos súboru na ¾avej strane skrátená." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Ve¾kos súboru na pravej strane skrátená." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Dátum vytvorenia na ¾avej strane." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Dátum vytvorenia na pravej strane." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "ktorý zo súborov má novší èas poslednej zmeny." -#: Merge.rc:2301 +#: Merge.rc:2304 #, 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:2302 +#: Merge.rc:2305 #, 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:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Krátky výsledok porovnania." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Atribúty na ¾avej strane." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Atribúty na pravej strane." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Typ zakonèenia riadka súboru na ¾avej strane" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Typ zakonèenia riadka súboru na pravej strane" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Kódovanie na ¾avej strane." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Kódovanie na pravej strane." -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zobrazí hviezdièku (*) ak je súbor binárny." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Porovna %1 s %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Zoznam oddelený èiarkami" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Zoznam oddelený tabulátormi" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "Jednoduché HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "Jednoduché XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4573,47 +4580,47 @@ msgstr "" "Chyba pri vytváraní správy:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Správa bola úspešne vytvorená." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "Rovnaký súbor je otvorený v boch paneloch." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Vybrané súbory sú rovnaké." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Oznaèený adresár existuje iba na druhej strane a preto ho nie je možné otvori." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Poèas porovnávania sa vyskytla chyba." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Binárne súbory nemožno porovna." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Súbory v adresári nemôžu by vizuálne porovnané." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4628,7 +4635,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4639,22 +4646,22 @@ msgstr "" " Pri súèasnom nastavení budú zjednotené na hlavný typ.\n" " Želáte si zmeni nastavenia a zachova rozdielne zakonèenia riadkov?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Poèas predspracovana súboru '%1' zásuvným modulom '%2' sa vyskytla chyba. Predspracovanie sa už nepoužije." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Zvolený adresár je neplatný." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nemôžem otvori binárny súbor v editore." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4665,132 +4672,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Varovanie: Súbory používajú rozlièné kódovania, ¾avý=%s a pravý=%s, a zlúèenie môže vies ku strate informácií." -#: Merge.rc:2356 +#: Merge.rc:2359 #, 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:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informácie sa stratili kvôli chybám v kódovaní: pravý subor" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informácie sa stratili kvôli chybám v kódovaní: ¾avý subor" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Bez rozdielu" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Rozdiely v riadkoch" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahradených %1 reazcov." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nemôžem nájs reazec \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Kopírova úplnú cestu" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Kopírova názov súboru" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Lokaèný panel" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Panel rozdielu" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Súbor so záplatou bol úspešne zapísaný." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. položka nenájdená alebo je to adresár!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. položka nenájdená alebo je to adresár!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 súbor zvolený]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Normálny" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Kontextový" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Zjednotený" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Nedalo sa zapisova do súboru %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, 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:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "uveïte výstupný súbor" -#: Merge.rc:2403 +#: Merge.rc:2406 #, 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:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nemohol som vytvori súbor so záplatou z adresárov." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4801,17 +4808,17 @@ msgstr "" "\n" "vytvorenie záplaty vyžaduje, aby v súboroch neboli neuložené zmeny." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Adresár neexistuje." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Aktuálne výsledky porovnania adresárov budú zmazané." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4822,7 +4829,7 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4831,7 +4838,7 @@ msgstr "" "\n" "Pozn.: integrácia 7-Zip je vyonutá v Nastaveniach WinMerge." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4840,37 +4847,37 @@ msgstr "" "\n" "Pozn.: integrácia 7-Zip je obmedzená na samostatnú (standalone) prevádzku v Nastaveniach WinMerge." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Vyberte súbor pre export" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Vyberte súbor pre import" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Nastavenia importované zo súboru." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Options exportované do súboru." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Nepodarilo sa importova nastavenia zo súboru." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Nepodarilo sa zapísa nastavenia do súboru." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4881,1098 +4888,1098 @@ msgstr "" "\n" "Chcete pokraèova?" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Chyba regulárneho výrazu" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Bez zhody" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Neplatný regulárny výraz" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Neplatný znak porovnávania" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Neplatný názov triedy znakov" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Spätná lomka na konci" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Neplatný spätný odkaz" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "[ alebo [^ bez náprotivku" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "( alebo \\( bez náprotivku" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "\\{ bez náprotivku" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Neplatný obsah \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "neplatný koniec rozsahu" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "nedostatok pamäte" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Neplatný predchádzajúci regulárny výraz" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Predèasný koniec regulárneho výrazu" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Regulárny výraz je príliš ve¾ký" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr ") alebo \\) bez náprotivku" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "afrikánèina" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "albánèna" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "arabèina (Saudská Arábia)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "arabèina (Irak)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "arabèina (Egypt)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "arabèina (Lýbia)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "arabèina (Alžírsko)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "arabèina (Maroko)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "arabèina (Tunisko)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "arabèina (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "arabèina (Jemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "arabèina (Sýria)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "arabèina (Jordánsko)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "arabèina (Libanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "arabèina (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "arabèina (Spojené arabské emiráty)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "arabèina (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "arabèina (Katar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "arménèina" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "azerbajdžanèina (latinka)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "azerbajdžanèina (cyrilika)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "baština" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "nieloruština" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "bulharèina" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "katalánèina" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "èínština (tradièná)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "èínština (zjednodušená)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "èínština (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "èínština (Singapur)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "èínština (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "chorvátèina" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "èeština" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "dánèina" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "holandèina" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "holandèina (Belgicko)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "angliètina (Spojené štáty)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "angliètina (Spojené krá¾ovstvo)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "angliètina (Austrália)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "angliètina (Kanada)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "angliètina (Nový Zéland)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "angliètina (Írsko)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "angliètina (Južná afrika)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "angliètina (Jamajka)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "angliètina (Karibik)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "angliètina (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "angliètina (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "angliètina (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "angliètina (Filipíny)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "estónèina" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "faerèina" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "perzština" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "fínèina" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "fancúzština" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "fancúzština (Belgicko)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "fancúzština (Kanada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "fancúzština (Švajèiarsko)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "fancúzština (Luxembursko)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "fancúzština (Monako)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "gruzínèina" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "nemèina (Nemecko)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "nemèina (Švajèiarsko)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "nemèina (Rakúsko)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "nemèina (Luxembursko)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "nemèina (Liechtenštajnsko)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "gréètina" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "hebrejèina" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "hindèina" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "maïarèina" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "islandèina" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "indonézština" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "talianèina" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "talianèina (Švajèiarsko)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "japonèina" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "kašmírèina (India)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "kazaština" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "kórejèina" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "kórejèina (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "lotyština" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "litovèina" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "malajèina (malajská)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "malajèina (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "manipuri" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "nórèina (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "nórèina (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "po¾ština" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "portugalèina" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "portugalèina (Brazília)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "rumunèina" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "ruština" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "sanskrit" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "srbèina (latinka)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "srbèina (cyrilika)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "sindhèina" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "slovenèina" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "slovinèina" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "španielèina" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "španielèina (Mexiko)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "španielèina (moderná)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "španielèina (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "španielèina (Kostarika)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "španielèina (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "španielèina (Dominikánska republika)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "španielèina (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "španielèina (Kolumbia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "španielèina (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "španielèina (Argentína)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "španielèina (Ekvádor)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "španielèina (Èile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "španielèina (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "španielèina (Paraguaj)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "španielèina (Bolívia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "španielèina (Salvádor)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "španielèina (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "španielèina (Nikaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "španielèina (Portoriko)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "svahilèina (Keòa)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "švédèina" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "švédèina (Fínsko)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "tamilèina" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "tatárèina (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "thajèina" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "tureètina" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "ukrajinèina" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "urdèina (Pakistan)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "urdèina (India)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "uzbeètina (latinka)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "uzbeètina (cyrilika)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "vietnamèina" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "západoeurópske" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "východoeurópske" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "východoázijské" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "juhovýchodná a juhozápadná Ázia" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "stredný východ" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "iné" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Approximuje ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Approximuje ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Approximuje ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Approximuje ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Approximuje ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Zmiešaný" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Uloží súbor v¾avo" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Uloží súbor vpravo" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Uloží ¾avý súbor pod názvom..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Uloží pravý súbor pod názvom..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Zmení stav ¾avého len na èítanie súboru/adresára" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Zmení stav pravého len na èítanie súboru/adresára" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Skonvertuje koniec riadka na štýl DOS" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Skonvertuje koniec riadka na štýl UNIX" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Skonvertuje koniec riadka na štýl MAC" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Prepne medzi režimami upravovania a spájania" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5981,12 +5988,12 @@ msgstr "" "Zobrazí a nastaví vlastnosti kódovania súborov\n" "Vlastnosti kódovania súborov" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5995,7 +6002,7 @@ msgstr "" "Vyberie oblas rozdielu na aktuálnom riadku\n" "Rozdiel na aktuálnom riadku" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6004,7 +6011,7 @@ msgstr "" "Ide na riadok alebo rozdiel\n" "Choï na (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6013,7 +6020,7 @@ msgstr "" "Nastaví možnosti programu\n" "Možnosti" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6022,37 +6029,37 @@ msgstr "" "Obnoví zobrazenie\n" "Obnovi (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Skopíruje vybrané riadky do schránky s pridaným èíslom riadka na zaèiatok" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Obnoví zvolené položky" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Prepne záložku" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Ide na ïalšiu záložku" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Ide na predošlú záložku" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Vymaže všetky záložky" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6061,7 +6068,7 @@ msgstr "" "Zobrazí položky, ktoré sú presne rovnaké\n" "Zobrazi identické položky" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6070,7 +6077,7 @@ msgstr "" "Zobrazí položky, ktoré majú rozdiely\n" "Zobrazi rozdielne položky" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6079,7 +6086,7 @@ msgstr "" "Zobrazí položky, ktoré existujú iba na ¾avej strane\n" "Zobrazi položky jedineèné v¾avo" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6088,7 +6095,7 @@ msgstr "" "Zobrazí položky, ktoré existujú iba na pravej strane\n" "Zobrazi položky jedineèné vpravo" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6097,7 +6104,7 @@ msgstr "" "Zobrazí binárne súbory\n" "Zobrazi binárne súbory" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6106,7 +6113,7 @@ msgstr "" "Zobrazí preskoèené položky\n" "Zobrazi preskoèené položky" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6115,7 +6122,7 @@ msgstr "" "Vyberie font pre zobrazenie\n" "Font pre zobrazenie" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6124,27 +6131,27 @@ msgstr "" "Vráti sa k používaniu predvoleného systémového fontu pre zobrazenie\n" "Predvolený font" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Zobrazí prázdne znaky" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Prepne panel rozdielov" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Lokaèný panel zobrazí celkový obraz súborov" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Zobrazí dialóg štatistika porovnania adresárov" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6153,7 +6160,7 @@ msgstr "" "Vyberá jazyk používate¾ského rozhrania\n" "Jazyk" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6162,12 +6169,12 @@ msgstr "" "Zobrazí rozdiely v rámci riadka odlišnou farbou\n" "Zobrazi rozdiel v riadku" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Vymení polohu dvoch panelov" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6176,7 +6183,7 @@ msgstr "" "Zobrazí èísla riadkov\n" "Zobrazi èísla riadkov" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6185,7 +6192,7 @@ msgstr "" "Zapne zalamovanie riadkov na hranici slov\n" "Zalamova riadky" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6194,17 +6201,17 @@ msgstr "" "Zobrazí okraje výberu v oboch paneloch\n" "Zobrazi okraje výberu" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6213,7 +6220,7 @@ msgstr "" "Skoèí na predchádzajúci rozdiel\n" "Predošlý rozdiel (Shift+Tab)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6222,7 +6229,7 @@ msgstr "" "Skoèí na ïalší rozdiel\n" "Ïalší rozdiel (Tab)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6231,7 +6238,7 @@ msgstr "" "Presunie na prvý rozdiel\n" "Prvý rozdiel (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6240,7 +6247,7 @@ msgstr "" "Presunie na aktuálny rozdiel\n" "Aktuálny rozdiel (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6249,7 +6256,7 @@ msgstr "" "Presunie na posledný rozdiel\n" "Posledný rozdiel (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6258,7 +6265,7 @@ msgstr "" "Skopíruje vybraný text do súboru vpravo\n" "Kopírova vpravo (->)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6267,7 +6274,7 @@ msgstr "" "Skopíruje vybraný text do súboru v¾avo\n" "Kopírova v¾avo (<-)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6276,7 +6283,7 @@ msgstr "" "Skopíruje rozdiel napravo a prejde na ïalší\n" "Skopírova doprava a na ïalší (Ctrl+Alt+vpravo)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6285,7 +6292,7 @@ msgstr "" "Skopíruje rozdiel na¾avo a prejde na ïalší\n" "Skopírova do¾ava a na ïalší (Ctrl+Alt+v¾avo)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6294,7 +6301,7 @@ msgstr "" "Skopíruje všetky rozdiely do súboru vpravo\n" "Všetko vpravo" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6303,72 +6310,72 @@ msgstr "" "Skopírujde všetky rozdiely do súboru v¾avo\n" "Všetko v¾avo" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Zmaže vybrané položky z oboch adresárov" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Porovná vybrané položky (ak sú zvolené viaceré položky, porovná prvú položku)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Vyberie a zmení poradie ståpcov pre porovnanie adresárov" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Vytvorí súbor so záplatou" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Vyberie a modifikuje filtre" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Vytvorí správu z výsledkov porovnania" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Používate¾ zvolí rozba¾ovací program (bez rozba¾ovania, keï sa otvára adresár)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Zvo¾te rozba¾ovací program, ktorým sa bude upravova tento súbor" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Bez predspracovania (bežné)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Odporúèané zásuvné moduly" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Iné zásuvné moduly" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Odoberie z pamäte všetky zásuvné moduly a znovu ich naèíta (pre vývojárov)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6377,12 +6384,12 @@ msgstr "" "Aktivuje ïalší vidite¾ný súbor\n" "Aktivuje ïalší súbor" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Zatvorí všetky otvorené okná" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6391,22 +6398,22 @@ msgstr "" "Zobrazá Pomocníka pre program WinMerge\n" "Pomoc" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Vypíše aktuálne informácie o verzii a konfigurácii WinMerge do textového súboru" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Zobrazá GNU licenciu" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Súkromné zostavenie: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6415,7 +6422,7 @@ msgstr "" "Otvára Obsah Pomocníka WinMerge\n" "Obsah Pomocníka" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6424,267 +6431,272 @@ msgstr "" "Otvára Vyh¾adávanie Pomocníka WinMerge\n" "Vyh¾adávanie Pomocníka" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Nastavenia zásuvných modulov" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Bez preprocesora" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Preprocessing, ak sa dá" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nenájdené - .sct skripty vypnuté" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "<Žiadny>" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Otvorí súbor registrovanou aplikáciou" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Otvorí súbor externým editorom" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Otvorí súbor konkrétnym programom" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Nezobrazuje presunuté bloky" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Zobrazuje všetky presunuté bloky" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Zobrazuje presunuté bloky iba z aktuálneho rozdielu" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Ide na rozdiel, ktorý je pod kurzorom" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Ch&oï na rozdiel %1 z %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "Ch&oï na riadok %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Vypnuté" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Zo súborového systému" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Zo zoznamu nedávno použitých" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Skry panel nástrojov" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Zobrazi malý panel nástrojov" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Zobrazi ve¾ký panel nástrojov" diff --git a/Src/Languages/Spanish.po b/Src/Languages/Spanish.po index 03522406f..37c3c91f1 100644 --- a/Src/Languages/Spanish.po +++ b/Src/Languages/Spanish.po @@ -73,7 +73,7 @@ msgstr "Cor&tar" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "&Copiar" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "&Pegar" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "Ir &a..." @@ -96,43 +96,43 @@ msgid "Op&en" msgstr "A&brir" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "con la aplicación ®istrada" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "con un &editor externo" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&con..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Archivo" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Nuevo\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" @@ -148,8 +148,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Abrir pro&yecto...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "&Guardar Proyecto..." @@ -160,1845 +160,1852 @@ msgid "Recent Projects" msgstr "Proyectos recientes" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Salir" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "Conf&iguración..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Ver" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Seleccionar &tipo de letra..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Usar tipo de letra del Siste&ma" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "&Combinar" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "&Ninguno" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "&Pequeño" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "Barra de &estado" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "&Pestañas" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "Idi&oma..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Herramientas" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtros..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Crear corrección..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "Desempaquetado &manual" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "Desempaquetado &automático" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Editar con desempaquetador" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Recargar plugins" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "&Depurar" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "&Cargar Configuración..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "&Restablecer Configuración" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "Ve&ntana" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Cerrar" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Cerrar &Todas" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Cambiar &Panel\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "Ordenar &Horizontalmente" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "Ordenar &Verticalmente" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Superponer" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "A&yuda" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Contenidos...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Índice..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Buscar..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "Conf&iguración..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "Soporte de &archivos deshabilitado..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "&Licencia Pública GNU..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&Acerca de WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir pro&yecto...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Lado i&zquierdo sólo lectura" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Lado d&erecho sólo lectura" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "&Codificación de archivo" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Seleccionar todo\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Mostrar elementos &idénticos" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Mostrar elementos &diferentes" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostrar elementos únicos en lado i&zquierdo" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar elementos únicos en lado &derecho" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Mostrar elementos i&gnorados" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "Mostrar archivos &binarios" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar elementos &ocultos" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Estadísticas de &comparación" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Actualizar\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Actualizar seleccionados\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Combinar" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparar\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Diferencia &siguiente\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferencia &anterior\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Primera diferencia\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferencia a&ctual\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Última diferencia\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar al lado &derecho\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar al lado &izquierdo\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Borrar\tDel" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Personalizar columnas..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Generar &informe..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Guardar\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Guardar lado &Izquierdo" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Guardar" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Guardar &como..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Guardar lado &Derecho" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "Configurar &página" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "&Vista preliminar" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Convertir saltos de línea a" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "&DOS (CRLF)" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "&UNIX (LF)" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "&MAC (CR)" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Modo &Combinación\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Des&hacer\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Rehacer\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Cor&tar\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Pegar\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleccionar dif. de &línea\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Buscar...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "R&eemplazar...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "Scri&pts" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Vacío >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "A&vanzado" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Copiar con &números de línea\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Marcadores" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Alternar &marcador\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "Marcador &siguiente\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Marcador &anterior\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Quitar todos los marcadores" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Ir &a...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Destacar sintaxis" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "B&loquear paneles" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Mostrar &espacios" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Mostrar diferencias de &línea" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Ver &números de línea" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Ver &márgenes" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "&Ajuste de línea" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "&Intercambiar paneles" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Panel de di&ferencias" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Panel de &posición" -#: Merge.rc:428 +#: Merge.rc:430 #, 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:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar al lado i&zquierdo y avanzar\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Copiar todas al lado de&recho" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Copiar todas al lado iz&quierdo" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Precomparación" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "Com¶r" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "Co&mparación especial" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&Izquierda a derecha" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "I&zquierda a..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "&Derecha a izquierda" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "D&erecha a..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Mover" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Izquierda a..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&Derecha a..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Eliminar" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Derecha" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Izquierda" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Ambos" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "Re&nombrar" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "&Ocultar elementos" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "Abrir archivo &izquierdo" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Abrir archivo &derecho" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Copiar nombres de &ruta" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Izquierda (%1 de %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Derecha (%1 de %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Ambos (%1 de %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Copiar nombres de &archivos" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Izquierda... (%1 de %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Derecha... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Ambos... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Di&ferencias... (%1 de %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "Ac&tualizar" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "Copiar &ruta completa" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Copiar &nombre de archivo" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Config. precomparación" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "Si&n precomparación" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Auto precomparación" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "Ir a &diferencia" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&No mostrar bloques movidos" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "Mostar &todos los bloques movidos" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Mostrar bloques movidos desde la dif. a&ctual" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Acerca de WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(Compilación Privada)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Derechos reservados." -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "¡Visite la Web de WinMerge!" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "Aceptar" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Colaboradores" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Seleccione archivos o carpetas..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Izquierda:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Examinar..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Derecha:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "E&xaminar..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Seleccionar..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "Desem&paq.:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Seleccionar..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "Incluir &subcarpetas" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Estado:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Ayuda" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Objetos para Comparar" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Base de datos:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Proyecto:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Usuario:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Contraseña:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Enlazar a proyecto VSS destino" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos los elementos" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Desproteger" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Guardar como..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Sistema de versionado" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Sistema de versionado:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ruta a cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "General" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Moverse automáticamente a la primera diferencia" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&No mostrar pantalla de bienvenida" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "C&errar ventanas con ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verificar rutas automáticamente en la ventana de apertura" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "&Permitir solo una instancia en ejecución" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "Preguntar al cerrar &múltiples ventanas" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-completar en diálogos de apertura:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Habilitar múltiples ventanas de comparación para" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "Comparación de &carpetas" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Comparación de &archivos" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Restablecer" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Idioma" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Idiomas disponibles:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Buscar" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "&Buscar:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Sólo palabras &completas" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Coincidir &mayúsculas y minúsculas" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "E&xpresión regular" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "No sobrepasar &fin de archivo" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Dirección" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Arriba" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "A&bajo" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "Buscar &sig." -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Reemplazar" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "&Reemplazar con:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "&Detenerse al final del archivo" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Reemplazar en" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Selección" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "&Todo el archivo" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "Reempla&zar" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Reempl. tod&o" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "Desproteger" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Comentarios" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "Proteger después de desproteger" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Filtros de línea" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Permitir filtros de línea" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expresiones regulares (una por línea):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Guardar" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "Nuevo" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "Eliminar" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Colores" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Diferencia:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Diferencia seleccionada:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Fondo" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Eliminada" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Diferencia ignorada:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Movida:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Movida Seleccionada:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Diferencia de palabra:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Dif. de palabra sel.:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Predeterminada" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Diálogo" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar archivos borrados a la Papelera de reciclaje." -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignorar diferencias de tiempo menores de 3 segundos." -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integración" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "&Añadir al menú contextual del explorador." -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "Habilitar &menú avanzado" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "In&cluir subcarpetas por defecto" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "Editor e&xterno:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "&Filtrar carpetas:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Examinar..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Generar corrección" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Archivo &1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Archivo &2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Examinar..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "&Intercambiar" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "&Anexar a archivo existente" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "Formato" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "Espacios en blanco" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "Co&mparar" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "I&gnorar cambios" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Ig&norar todos" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorar &líneas en blanco" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "Sensible a ma&y./min." -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Incluir línea de c&omando" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir en editor e&xterno" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Mostrar Columnas" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "&Arriba" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "A&bajo" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Seleccionar Desempaquetador" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Desempaquet.:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Mostrar todos los desempaquetadores, no comprobar exts." -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Extensiones:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Descripción:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr " Progreso de comparación de carpetas" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Detener" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Comparando elementos..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Elementos comparados:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Total:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Ir a" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "Ir a:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Archivo" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Objetivo" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "&Línea" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Diferencia" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "Ir &a" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Espacios en blanco" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "&Ignorar cambios" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "I&gnorar todos" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar diferencias de líneas &vacías" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "Ignorar diferencias &mayúsculas/minúsculas" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Ignorar &saltos de línea diferentes (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "&Habilitar detección de bloques movidos" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "Co&mbinar con líneas similares" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "Com¶r:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "&Parar después de la primera diferencia" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Filtrar comentarios" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "Resaltar sinta&xis" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "&Actualización automática" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "Preservar caracteres &EOL originales" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabulaciones" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Tamaño de tab.:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "&Insertar tabulaciones" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Insertar e&spacios" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Coloración de las diferencias de línea" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Ver diferencias de línea" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "A nivel de &caracter" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "A nivel de &palabra:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filtros de archivo" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Probar" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Nuevo..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Eliminar..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "¿Guardar archivos modificados?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Archivo en lado izquierdo" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Guardar cambios" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Descartar cambios" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Archivo en lado derecho" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "&Guardar cambios" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "&Descartar cambios" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Descartar todo" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Página de códigos" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Página de código predeterminada" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2007,32 +2014,32 @@ msgstr "" "&Detectar página de códigos para éstos archivos : .html, .rc, .xml \n" "Es necesario reiniciar." -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "Página de códigos del &sistema" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "La misma que el &interface de usuario de WinMerge" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "&Página de códigos:" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Soporte de archivos deshabilitado" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Imposible detectar la versión de 7-Zip (¿no instalado?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2041,12 +2048,12 @@ msgstr "" "El soporte de archivos requiere 7-Zip o posterior instalado en su PC, o sus \n" "componentes esenciales copiados en la carpeta del programa para operar en solitario." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Además debe haber un plugin de interface apropiado (Merge7z*.dll) en la ruta." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2055,12 +2062,12 @@ msgstr "" "Por favor, use la versión de 7-Zip recomendada debajo hasta que haya disponible \n" "una nueva versión del plugin de interface." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Versión" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2069,54 +2076,54 @@ msgstr "" "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Versión recomendada de 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "presente" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado en su computadora:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "ninguno" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "falta" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes 7-Zip para op. en solitario:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "obsoleto" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Plugins en la ruta:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2125,486 +2132,486 @@ msgstr "" "No mostrar este &mensaje de nuevo.\n" "(Puede volver a mostrar éste mensaje desde la configuración.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Descarga de plugin" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Configuración" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Categorías" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Palabras clave:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Nombres de función:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Comentarios:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Números:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Cadenas:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Preprocesar:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Usuario 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Usuario 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Negrita" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Informe de comparación de carpetas" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "Archivo de In&forme:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "E&stilo:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar al Portapapeles" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartido o Privado" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "¿Qué tipo de filtro quiere crear?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro compartido (para todos los usuarios de esta máquina)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privado (solo para el usuario actual)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Soporte de Archivos" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "El soporte de archivos requiere el plugin de 7-Zip instalado:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Descargar plugin de 7-zip" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Habilitar soporte de archivos" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Utilizar 7-Zip en solitario si está disponible" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "Utilizar 7-Zip &local de la carpeta de WinMerge" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar tipo de archivo por su firma" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Estadísticas de comparación" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Carpetas:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Archivos:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Diferentes" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binario:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Únicos" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Izquierda:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Derecha:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Iguales" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Cerrar" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Afecta" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Seleccione página de códigos para" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&Carga de archivos:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "&Guardado de archivos:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&Usar la misma página de códigos para ambos" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Prueba de filtro" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Probando filtro ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Texto a probar:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Nombre de carpeta" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "&Probar" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Cerrar" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&Usar colores personalizados para el texto" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Colores elegidos para texto normal" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Espacio:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Texto normal:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Selección:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Rutas" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Sól&o lectura" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Só&lo lectura" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Guardar..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Archivos de seguridad" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Crear archivos de seguridad en:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Crear archivos de seguridad en:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "Carpeta del archivo &original" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "Carpeta de copia de se&guridad:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Nombre de archivo:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "&Añadir extensión .bak" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "Añadir &fecha" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "Confirmar copia" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "¿Está seguro que quiere copiar XXX elementos?" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "De la izquierda" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "A la derecha" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Sí" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "No" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "0c0a04e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Traducido por: Dean Grimm, Jesus M. Delgado 'Mack' y Mario Angel" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0xc0a, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Listo" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "MAY" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2613,7 +2620,7 @@ msgstr "" "Crear documentos vacíos\n" "Nuevo Documento (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2622,7 +2629,7 @@ msgstr "" "Comparar archivos o carpetas\n" "Comparar" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2631,7 +2638,7 @@ msgstr "" "Cerrar ventana\n" "Cerrar" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2640,7 +2647,7 @@ msgstr "" "Guardar los documentos abiertos\n" "Guardar" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2649,7 +2656,7 @@ msgstr "" "Guardar el documento activo con otro nombre\n" "Guardar como" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2658,7 +2665,7 @@ msgstr "" "Cambiar las opciones de impresión\n" "Configurar página" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2667,7 +2674,7 @@ msgstr "" "Cambiar la impresora y las opciones de impresión\n" "Configurar impresora" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2676,7 +2683,7 @@ msgstr "" "Imprimir el documento activo\n" "Imprimir" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2685,12 +2692,12 @@ msgstr "" "Mostrar vista preliminar\n" "Vista preliminar" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Mostrar todos los elementos ocultos" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2699,32 +2706,32 @@ msgstr "" "Abrir archivos del proyecto\n" "Proyecto (Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Error desconocido al intentar abrir el proyecto" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Error desconocido al intentar guardar el proyecto" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Archivo de Proyecto" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Archivo de proyecto cargado con éxito." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Archivo de proyecto guardado con éxito." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2733,7 +2740,7 @@ msgstr "" "Guardar las rutas y configuraciones actuales al archivo de proyecto\n" "Guardar Archivo de Proyecto" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2742,7 +2749,7 @@ msgstr "" "Muestra informacíon de la aplicación, versión, y copyright\n" "Acerca de WinMerge" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2751,9 +2758,6 @@ msgstr "" "Cerrar la aplicación\n" "Salir" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2767,11 +2771,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Abrir éste documento" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2780,7 +2787,7 @@ msgstr "" "Cambiar al panel siguiente\n" "Panel Siguiente " -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2789,7 +2796,7 @@ msgstr "" "Cambiar al panel anterior\n" "Panel Anterior" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2798,7 +2805,7 @@ msgstr "" "Abre una nueva ventana para el documento activo\n" "Nueva Ventana" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2807,7 +2814,7 @@ msgstr "" "Organizar iconos en la parte inferior de la pantalla\n" "Organizar Iconos" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2816,7 +2823,7 @@ msgstr "" "Organizar ventanas en cascada (superpuestas)\n" "Superponer" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2825,7 +2832,7 @@ msgstr "" "Ordenar las ventanas horizontalmente\n" "Ordenar" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2834,7 +2841,7 @@ msgstr "" "Ordenar las ventanas verticalmente\n" "Ordenar" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2843,7 +2850,7 @@ msgstr "" "Dividir la ventana activa en paneles\n" "Dividir" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2852,7 +2859,7 @@ msgstr "" "Borrar la selección\n" "Borrar" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2861,7 +2868,7 @@ msgstr "" "Eliminar todo\n" "Eliminar todo" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2870,7 +2877,7 @@ msgstr "" "Copiar la sección al portapapeles\n" "Copiar" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2879,7 +2886,7 @@ msgstr "" "Cortar la selección en el portapapeles\n" "Cortar" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2888,7 +2895,7 @@ msgstr "" "Buscar el texto especificado\n" "Buscar" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2897,7 +2904,7 @@ msgstr "" "Insertar contenido del portapapeles\n" "Pegar" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2906,7 +2913,7 @@ msgstr "" "Repetir la última acción\n" "Repetir" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2915,7 +2922,7 @@ msgstr "" "Reemplazar un texto especificado con otro\n" "Reemplazar" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2924,7 +2931,7 @@ msgstr "" "Seleccionar el documento completo\n" "Seleccionar todo" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2933,7 +2940,7 @@ msgstr "" "Deshacer el último cambio\n" "Deshacer" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2942,7 +2949,7 @@ msgstr "" "Rehacer\n" "Rehacer" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2951,7 +2958,7 @@ msgstr "" "Muestra la barra de herramientas\n" "Barra de Herramientas" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2960,7 +2967,7 @@ msgstr "" "Muestra la Barra de Estado\n" "Barra de Estado" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2969,7 +2976,7 @@ msgstr "" "Muestra las pestañas\n" "Mostrar las pestañas" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "" "Automatically resize panes\n" @@ -2978,57 +2985,57 @@ msgstr "" "Cambia el tamaño del panel automáticamente\n" "Bloquear Paneles" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Cambia el tamaño de la ventana" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Cambia la posición de la ventana" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Reduce la ventana a un icono" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Maximiza la ventaña a tamaño completo" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Cambia a la ventana del documento siguiente" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Cambia a la ventana del documento anterior" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Cierra la ventana activa y pregunta al usuario si desea guardar los cambios" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Devuelve la ventaña a su tamaño normal" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Activa el Administrador de Tareas" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Activa ésta ventana" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3037,7 +3044,7 @@ msgstr "" "Cierra la previsualización\n" "Cancelar previsualización" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3056,23 +3063,23 @@ msgstr "" "WinMerge.Document\n" "Documento de WinMerge" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar caracteres EOL originales" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Pulse una tecla" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Haga click derecho en la ruta para copiar" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3081,152 +3088,152 @@ msgstr "" "Desarrolladores:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 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:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&Aceptar" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Cancelar" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Reintentar" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Ignorar &todos" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Sí" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Sí a to&do" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&No" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "No a &todo" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Omitir" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "O&mitir todos" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "No mostrar este &mensaje de nuevo." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "No &preguntar de nuevo." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Colores por Sintaxis" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Colores de Texto" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Control de Versiones" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "De la izquierda:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "A la izquierda:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "De la derecha:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "A la derecha:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Versión %1 - Español" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Configuración (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas las cajas de mensaje se mostrarán de nuevo." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Se han realizado modificaciones en los archivos de la sesion de comparación actual. Algunas configuraciones pueden no surtir efecto hasta que la comparación de archivos se ejecute de nuevo." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "La fuente seleccionada no se aplicará a ninguna de las ventanas de diferencias abiertas actualmente." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3237,7 +3244,7 @@ msgstr "" "\n" "Por favor, utilice valores 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3248,107 +3255,107 @@ msgstr "" "\n" "Por favor reinicie WinMerge después de restablecer." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos los archivos (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos los archivos (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Archivos de Proyecto de WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Archivos de opciones (*.ini)|*.ini|Todos los archivos (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Archivos HTML (*.htm,*.html)|*.htm;*.html|Todos los archivos (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Archivos XML (*.xml)|*.xml|Todos los archivos (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Todo el contenido" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Contenido rápido" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Fecha de modificación" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Fecha de modificación y Tamaño" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Tamaño" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Nombre" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Ubicación" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filtos" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Descripción" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Seleccione nombre de archivo para el nuevo filtro" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Archivo de filtros (*.flt)|*.flt|Todos los archivos(*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3361,7 +3368,7 @@ msgstr "" "Por favor copie el archivo %1 a la carpeta WinMerge/Filters:\n" "%2." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3374,7 +3381,7 @@ msgstr "" "\n" "Por favor, compruebe que la carpeta existe y que tiene permisos de escritura en ella." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3385,7 +3392,7 @@ msgstr "" "\n" "Por favor, seleccione la carpeta de filtros en Configuración/Sistema." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3398,12 +3405,12 @@ msgstr "" "\n" "¿Quiza el archivo es de solo lectura?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Seleccione el archivo de filtros a instalar." -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3414,208 +3421,208 @@ msgstr "" "\n" "No se pudo copiar el archivo de filtros a la carpeta de filtros." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "El archivo de filtros ya existe. ¿Desea sobreescribirlo?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Expresión regular" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Ruta a cleartool.exe :" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "R&uta a SS.EXE :" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Resultado de la comparación de carpetas" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Comparación de archivos" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Sin título izquierda" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Sin título derecha" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Escaneando archivos..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Abriendo la selección" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Copiando lado izquierdo a lado derecho" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Copiando lado derecho a lado izquierdo" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Copiando todo al lado izquierdo" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Copiando todo al lado derecho" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Copiando archivos..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Eliminando archivos..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Moviendo archivos..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Creando el informe..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Línea: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Ch: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Diferencia %1 de %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferencias encontradas" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 Diferencia encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Archivo %1 de %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Elementos: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dos carpetas o archivos existentes a comparar" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Selección de carpeta" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dos carpetas o archivos a comparar." -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "¡La ruta del lado izquierdo no es válida!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "¡La ruta del lado derecho no es válida!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "¡Ninguna ruta es válida !" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Elija dos archivos para habilitar selección de desempaquetador." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "¡Imposible comparar un archivo y una carpeta!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Archivo no encontrado: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Archivo no desempaquetado: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3628,7 +3635,7 @@ msgstr "" "\n" "son archivos binarios idénticos." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3641,7 +3648,7 @@ msgstr "" "\n" "son archivos binaros diferentes." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3652,7 +3659,7 @@ msgstr "" "\n" "es un archivo binario. No es posible comparar archivos binarios con archivos de texto." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3665,37 +3672,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Guardar Como" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "¿Guardar los cambios a %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Error comprobando la posibilidad de escritura en destino" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Error haciendo copia de seguridad del archivo" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3708,7 +3715,7 @@ msgstr "" "\n" "¿Continuar de todas formas?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3725,7 +3732,7 @@ msgstr "" "\t-usar un nombre diferente (Aceptar)\n" "\t-cancelar la operación (Cancelar)" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3740,7 +3747,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3755,7 +3762,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3770,7 +3777,7 @@ msgstr "" "\n" "¿Desea sobreescribir el archivo cambiado?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3779,7 +3786,7 @@ msgstr "" "%1\n" "es de sólo lectura. ¿Desea sobreescribirlo de todos modos?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3794,17 +3801,17 @@ msgstr "" "\n" "Si desea actualizar los archivos, cierre la comparación actual y ábrala de nuevo." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Guardar lado izquierdo como" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Guardar lado derecho como" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3815,42 +3822,42 @@ msgstr "" "\n" "Actualize los documentos antes de continuar." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger archivos de VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Error ejecutando el comando del sistema de versionado." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "¡No se encontraron base(s) de datos de VSS!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Error de VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3861,7 +3868,7 @@ msgstr "" " Por favor, compruebe la configuración de la vista utilizada.\n" " ¿Desea deshacer la desprotección?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3870,179 +3877,179 @@ 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Ninguno" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor que 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 y superior)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Parar en espacio en blanco" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Parar en espacio en blanco o puntuación" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Copiar elemento seleccionado a la carpeta" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Copiar elemento seleccionado a la carpeta elegida" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Eliminar elemento selecionado del lado izquierdo" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Eliminar elemento selecionado del lado derecho" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Eliminar elementos seleccionados de ambos lados" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ocultar elementos seleccionados (filtro al vuelo)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Renombrar el elemento seleccionado en ambos lados" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Lado derecho a lado izquierdo (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Lado izquierdo a lado derecho (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Lado derecho a lado izquierdo (%1 de %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lado izquierdo a lado derecho (%1 de %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Lado izquierdo a... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Lado derecho a... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lado izquierdo a... (%1 de %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Lado derecho a... (%1 de %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Lado izquierdo (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Lado derecho (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Ambos lados (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Lado izquierdo (%1 de %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Lado derecho (%1 de %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos lados (%1 de %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Seleccione carpeta de destino" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Izquierda - Seleccione carpeta destino:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Derecha - Seleccione carpeta destino:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Archivos Afectados)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Archivos Afectados)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "¿Está seguro de que desea copiar todas las diferencias al lado izquierdo?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "¿Está seguro de que desea copiar todas las diferencias al lado derecho?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4057,17 +4064,17 @@ msgstr "" "a\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "¿Está seguro de que desea copiar %1 de %2 elementos seleccionados?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "¿Está seguro de que desea eliminar %1 de %2 elementos seleccionados?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4078,7 +4085,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4089,17 +4096,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Está seguro de copiar:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Está seguro de copiar %d elementos:" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4118,458 +4125,458 @@ msgstr "" "\n" "Por favor actualice la comparación." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Abrir archivo del lado izquierdo" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Abrir archivo del lado izquierdo con editor externo" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Abrir archivo del lado izquierdo con..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Abrir archivo del lado derecho" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Abrir archivo del lado derecho con editor externo" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Abrir archivo del lado derecho con..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Error al ejecutar editor externo: %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Extension del editor externa desconocida: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Copiar nombres de archivo al portapapeles" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copiar rutas del lado izquierdo al portapapeles" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copiar rutas del lado derecho al portapapeles" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copiar rutas del ambos lados al portapapeles" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Formato de archivo desconocido" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Añadir elementos del lado izquierdo al archivo" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Añadir elementos del lado derecho al archivo" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Añadir elementos de ambos lados al archivo" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Añadir elementos diferentes al archivo (ambos lados)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Seleccionar carpeta donde mover archivo selecionado del lado izquierdo" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Seleccionar carpeta donde mover archivo selecionado del lado derecho" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Nombre" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Carpeta" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Resultado" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Fecha izq." -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Fecha dcha." -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Extensión" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Tamaño izq." -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Tamaño dcha." -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Tamaño dcha. (Corto)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Tamaño izq. (Corto)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Fecha de creacion izq." -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Fecha de creacion dcha." -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Archivo más reciente" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Versión archivo izq." -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Versión archivo dcha." -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Resultados abreviados" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Atributos izq." -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Atributos dcha." -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "EOL izq." -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "EOL dcha." -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Codificación izq." -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Codificación dcha." -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Difs. ignoradas" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Diferencias" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binario" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "No se pueden comparar los archivos" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Elemento cancelado" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Archivo omitido" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Carpeta omitida" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Sólo Izquierda: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Sólo Derecha: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "Los archivos binarios son iguales" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "Los archivos binarios son diferentes" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Los archivos son diferentes" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Sólo Izquierda" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Sólo Derecha" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "Error" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tiempo transcurrido: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 elemento seleccionado" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 elementos seleccionados" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Nombre de archivo o carpeta." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nombre de subcarpeta cuando se incluyen las subcarpetas." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Resultados de la comparacion, formato largo." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Fecha de modificación del archivo del lado izquierdo." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Fecha de modificación del archivo del lado derecho." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Extensión del archivo." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Tamaño del archivo del lado izquierdo en bytes." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Tamaño del archivo del lado derecho en bytes." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Tamaño del archivo del lado izquierdo abreviado." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Tamaño del archivo del lado derecho abreviado." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Fecha de creación del archivo del lado izquierdo." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Fecha de creación del archivo del lado derecho." -#: Merge.rc:2300 +#: Merge.rc:2303 #, 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:2301 +#: Merge.rc:2304 #, 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:2302 +#: Merge.rc:2305 #, 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:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Resultados de la comparación abreviados." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Attributos del archivo del lado izquierdo." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Attributos del archivo del lado derecho." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL del archivo del lado izquierdo." -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL del archivo del lado derecho." -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Codificación del lado izquierdo." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Codificación del lado derecho." -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Muestra un asterisco (*) si el archivo es binario." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 con %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Lista separada por comas" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabuladores" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "HTML Simple" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "XML Simple " -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4578,47 +4585,47 @@ msgstr "" "Error al crear el informe:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "El informe se ha creado correctamente." -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "El mismo archivo está abierto en ambos paneles." -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "Los archivos seleccionados son iguales" -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "La carpeta seleccionada existe sólo en el otro lado, y por tanto no puede ser abierta." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocurrió un error cuando se estaban comparando los archivos" -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Los archivos binarios no se puede comparar visualmente." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Las carpetas no se pueden comparar visualmente." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4633,7 +4640,7 @@ 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:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4644,22 +4651,22 @@ msgstr "" " Con la configuración actual, serán unificados al tipo principal.\n" " ¿Desea cambiar las opciones y preservar los EOL diferentes?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Ocurrió un error mientras se precomparaba el archivo '%1' con el plugin '%2'. La precomparación no será aplicada de nuevo." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada no es válida." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "No se puede abrir un archivo binario en el editor." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4670,132 +4677,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Atención: los archivos utilizan codificaciones diferentes, izquierdo=%s y derecho=%s, y la combinación podría provocar perdida de información." -#: Merge.rc:2356 +#: Merge.rc:2359 #, 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:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Información perdida debido a errores de codificación: archivo derecho" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Información perdida debido a errores de codificación: archivo izquierdo" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "No hay diferencia" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Diferencia de línea" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Reemplazada(s) %1 cadena(s)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposible encontrar la cadena \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Copiar ruta completa" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Copiar nombre de archivo" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Panel de ubicación" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Panel de diferencias" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Archivo de corrección escrito correctamente." -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ¡elemento no encontrado o es una carpeta!" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ¡elemento no encontrado o es una carpeta!" -#: Merge.rc:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 archivo(s) selecionado(s)]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "No se pudo escibir en el archivo %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, 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:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Especifique un archivo de salida" -#: Merge.rc:2403 +#: Merge.rc:2406 #, 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:2404 +#: Merge.rc:2407 #, 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:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4806,17 +4813,17 @@ msgstr "" "\n" "Crear una corrección requiere que no haya cambios pendientes de ser guardados." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existe." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Los resultados de comparación de carpetas actuales serán eliminados." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4827,7 +4834,7 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4836,7 +4843,7 @@ msgstr "" "\n" "Nota: La integración con 7-Zip está deshabilitada en la configuracion de WinMerge." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4845,37 +4852,37 @@ msgstr "" "\n" "Nota: La integración con 7-Zip está restringida a operación en solitario en la configuracion de WinMerge." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Seleccione archivo a exportar" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Seleccione archivo a importar" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Configuración importada del archivo." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Configuración exportada al archivo." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Fallo al importar la configuración del archivo." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Fallo al exportar la configuración al archivo." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4886,1098 +4893,1098 @@ msgstr "" "\n" "¿Desea continuar?" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Error en expresión regular" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "No hay coincidencias" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Expresión regular no válida." -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Carácter de intercalación no válido." -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Nombre de clase de carácter inválida" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Barra invertida" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Referencia trasera inválida" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Falta carácter final de [ o [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Falta carácter final de ( o \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Falta carácter final de \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Contenido no válido en \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Fin de rango no válido" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Memoria insuficiente" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Expresión regular precedente no válida" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "Fin de expresión regular prematuro" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Expresión regular demasiado grande" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Falta carácter inicial de ) o \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Africano" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanés" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Árabe (Arabia Saudita)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Árabe (Irak)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Árabe (Egipcio)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Árabe (Libio)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Árabe (Argelino)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Árabe (Marroquí)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Árabe (Tunecino)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Árabe (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Árabe (Yemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Árabe (Sirio)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Árabe (Jordano)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Árabe (Líbano)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Árabe (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Árabe (UAE)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Árabe (Bahráin)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Árabe (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armenio" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azeri (Latino)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azeri (Cirílico)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Euskera" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Bieloruso" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Búlgaro" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Catalán" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Chino (Tradicional)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Chino (Simplificado)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Chino (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Chino (Singapur)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Chino (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Croata" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Checo" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Danés" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Belga" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Belga (Bélgica)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Inglés (US)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Inglés (UK)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Inglés (Australia)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Inglés (Canadá)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Inglés (Nueva Zelandia)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Inglés (Irlandés)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Inglés (Sud África)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Inglés (Jamaica)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Inglés (Caribe)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Inglés (Bélice)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Inglés (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Inglés (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Inglés (Filipinas)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Estonia" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Faeroese" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Persia" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Suomi" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Francés" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Francés (Bélgica)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Francés (Canadá)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Francés (Suiza)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Francés (Luxemburgo)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Francés (Mónaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgiano" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Alemán (Alemania)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Alemán (Suiza)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Alemán (Austria)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Alemán (Luxemburgo)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Alemán (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Griego" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebreo" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Hindú" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Húngaro" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Islandés" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesio" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italiano" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italiano (Suiza)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japonés" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmiri (India)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Kazakh" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Koreano" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Koreano (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Letón" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Lituano" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malayo (Malasia)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malayo (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "Manipuri" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Noruego (Bokmal)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Noruego (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polaco" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugués" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugués (Brasil)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Rumano" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Ruso" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sanscrito" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbio (Latino)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbio (Cirílico)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "Sindhi" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Eslovaco" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Esloveno" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Español" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Español (México)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Español (Moderno)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Español (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Español (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Español (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Español (Dominicana)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Español (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Español (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Español (Perú)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Español (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Español (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Español (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Español (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Español (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Español (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Español (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Español (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Español (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Español (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Kenia)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Sueco" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Sueco (Finlandia)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tamil" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatar (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Tailandés" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turco" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ucraniano" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "Urdu (Pakistán)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (India)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbeko (Latino)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbeko (Cirílico)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamita" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Europeo occidental" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Europeo oriental" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Asiático del este" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "Asiático sudeste & suroeste" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Medio Oriente" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "No aplicable" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cirílico" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arábico" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Griego" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Borde Báltico" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latino 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Griego 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latino 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cirílico" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turco" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugués" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandés" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreo" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Canadá Francés" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nórdico" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cirílico CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Griego 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japonés" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chino Simplificado" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Koreano" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chino Tradicional" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Latino 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cirílico (Eslavo)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Latino 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Griego" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latino 5 (Turco)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreo" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Árabe" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Borde Báltico" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnam" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romano" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Griego" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cirílico" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europa Central" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turco" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Aproximadamente ISO-8859-2" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Aproximadamente ISO-8859-1" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Aproximadamente ISO-8859-7" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Aproximadamente ISO-8859-9" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Aproximadamente ISO-8859-8" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Mezclado" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Guardar el archivo del lado izquierdo" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Guardar el archivo del lado derecho" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Guardar el archivo del lado izquierdo como..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Guardar el archivo del lado derecho como..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Cambiar el modo sólo lectura del archivo/carpeta del lado izquierdo" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Cambiar el modo sólo lectura del archivo/carpeta del lado derecho" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Convertir EOL a formato DOS" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Convertir EOL a formato UNIX" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Convertir EOL a formato MAC" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Cambiar entre modo edición y modo combinación" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5986,12 +5993,12 @@ msgstr "" "Ver y ajustar propiedades de codificación del archivo\n" "Propiedades de codificación del archivo" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -6000,7 +6007,7 @@ msgstr "" "Selecciona el área diferente de la línea actual\n" "Diferencias de línea actual" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6009,7 +6016,7 @@ msgstr "" "Ir a línea o diferencia\n" "Ir a (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6018,7 +6025,7 @@ msgstr "" "Configurar las opciones del programa\n" "Configuración" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6027,37 +6034,37 @@ msgstr "" "Actualizar la pantalla\n" "Actualizar (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar las líneas seleccionadas al portapapeles añadiendo números de línea al principio de cada una de ellas" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Actualizar elementos seleccionados" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Alternar marcador" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Ir al siguiente marcador" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Ir al marcador anterior" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Quitar todos los marcadores" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6066,7 +6073,7 @@ msgstr "" "Muestra los elementos que son exactamente iguales\n" "Mostrar elementos iguales" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6075,7 +6082,7 @@ msgstr "" "Muestra los elementos que tienen diferencias\n" "Mostrar elementos diferentes" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6084,7 +6091,7 @@ msgstr "" "Muestra los elementos que existen solo en la parte izquierda\n" "Mostrar elementos únicos en lado izquierdo" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6093,7 +6100,7 @@ msgstr "" "Muestra los elementos que existen sólo en la parte derecha\n" "Mostrar elementos únicos en lado derecho" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6102,7 +6109,7 @@ msgstr "" "Muestra los archivos binarios\n" "Mostrar archivos binarios" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6111,7 +6118,7 @@ msgstr "" "Muestra los elementos ignorados durante la comparación\n" "Mostrar elementos ignorados" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6120,7 +6127,7 @@ msgstr "" "Seleccione la fuente\n" "Seleccionar fuente" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6129,27 +6136,27 @@ msgstr "" "Usar la fuente del sistema\n" "Fuente predeterminada" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Muestra los espacios en blanco" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Muestra el panel de diferencias" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Muestra el panel de ubicación con una imagen global de los archivos" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Muestra el diálogo de estadísticas de comparación de carpetas" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6158,7 +6165,7 @@ msgstr "" "Permite seleccionar el idioma del interface de usuario\n" "Idioma" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6167,12 +6174,12 @@ msgstr "" "Muestra las diferencias en las líneas en un color diferente\n" "Mostrar diferencias de línea" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Intercambia la posición de los dos paneles" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6181,7 +6188,7 @@ msgstr "" "Muestra los números de línea\n" "Mostrar números de línea" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6190,7 +6197,7 @@ msgstr "" "Ajusta la longitud de las líneas al ancho del panel\n" "Ajuste de línea" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6199,17 +6206,17 @@ msgstr "" "Muestra los márgenes en ambos paneles\n" "Mostrar los márgenes" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6218,7 +6225,7 @@ msgstr "" "Ir a la diferencia anterior\n" "Dif. anterior (Alt Up)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6227,7 +6234,7 @@ msgstr "" "Ir al la siguiente diferencia\n" "Dif. siguiente (Alt Down)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6236,7 +6243,7 @@ msgstr "" "Ir al la primera diferencia\n" "Primera dif. (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6245,7 +6252,7 @@ msgstr "" "Ir a la diferencia actual\n" "Dif. actual (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6254,7 +6261,7 @@ msgstr "" "Ir a la última diferencia\n" "Última dif. (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6263,7 +6270,7 @@ msgstr "" "Copiar el texto seleccionado al lado derecho\n" "Copiar a la derecha (Alt Derecha)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6272,7 +6279,7 @@ msgstr "" "Copiar el texto seleccionado al lado izquierdo\n" "Copiar a la izquierda (Alt Izquierda)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6281,7 +6288,7 @@ msgstr "" "Copiar diferencia al lado derecho e ir a la siguiente\n" "Copiar a la derecha y avanzar (Ctrl+Alt+Right)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6290,7 +6297,7 @@ msgstr "" "Copiar diferencia al lado izquierdo e ir a la siguiente\n" "Copiar a la izquierda y avanzar (Ctrl+Alt+Left)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6299,7 +6306,7 @@ msgstr "" "Copiar todas las diferencias al lado derecho\n" "Todas a la derecha" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6308,72 +6315,72 @@ msgstr "" "Copiar todas las diferencias al lado izquierdo\n" "Todas a la izquierda" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Borra los elementos seleccionados de ambas carpetas" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Compara el elemento seleccionado (compara el primero si hay múltiples elementos seleccionados)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleccionar y reordenar las columnas de la comparación de carpetas" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Generar un archivo de corrección" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Seleccionar y modificar filtros" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Genera un informe con los resultados de la comparación" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "El usuario selecciona el desempaquetador (no se desempaqueta cuando se comparan carpetas)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleccione un desempaquetador para editar éste archivo" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Sin precomparación (normal)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Otros plugins" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descargar todos los plugins y actualizarlos (para desarrolladores)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6382,12 +6389,12 @@ msgstr "" "Cambia al siguiente panel visible\n" "Cambiar Panel Siguiente" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Cierra todas las ventanas abiertas" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6396,22 +6403,22 @@ msgstr "" "Muestra la ventana de ayuda\n" "Ayuda" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Escribe la información de la versión actual de Winmerge y la configuración a un archivo de texto" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Muestra la Licencia Pública GNU" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Compilación Privada: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6420,7 +6427,7 @@ msgstr "" "Abre el índice de la ayuda de WinMerge\n" "Índice" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6429,267 +6436,272 @@ msgstr "" "Abre la ventana de búsqueda en la ayuda de WinMerge\n" "Buscar" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Configuración de plugin" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Sin precomparación" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Precomparación si es posible" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH no encontrado - scripts .sct deshabilitados" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Abre el archivo con la aplicación registrada" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Abre el archivo con un editor externo" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Abre el archivo con un programa en particular" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "No mostrar bloques movidos" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Mostrar todos los bloques movidos" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mostrar sólo bloques movidos a partir de la diferencia actual" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Ir a la diferencia bajo el cursor" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Ir &a diferencia %1 de %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "Ir a &línea %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Deshabilitado" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Del sistema de archivos" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "De la lista MRU" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Ocultar la barra de herramientas" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Mostrar barra pequeña de herramientas" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Mostrar barra grande de herramientas" diff --git a/Src/Languages/Swedish.po b/Src/Languages/Swedish.po index 395016cb3..e56086852 100644 --- a/Src/Languages/Swedish.po +++ b/Src/Languages/Swedish.po @@ -72,7 +72,7 @@ msgstr "&Klipp ut" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "K&opiera" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "K&listra in" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "&Gå till..." @@ -95,43 +95,43 @@ msgid "Op&en" msgstr "Öp&pna" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "med &Registrerat program" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "med &Extern editor" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "&med..." #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Arkiv" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Öppna...\tCtrl+O" @@ -147,8 +147,8 @@ msgid "Open Project...\tCtrl+J" msgstr "Öppna Projekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "Sp&ara Projekt..." @@ -159,1845 +159,1852 @@ msgid "Recent Projects" msgstr "Tidigare Projekt" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "&Avsluta" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Redigera" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Inställningar..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Visa" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Välj tecken&snitt..." #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "Använd standardtec&kensnitt" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "&Verktygsrad" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "&Ingen" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "&Liten" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "&Stor" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "S&tatusfält" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "Fi&lrad" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "S&pråk..." #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "Verkt&yg" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filter..." #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Skapa patch..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "&Manuell Uppackning" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk Uppackning" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Ändra med Uppackare" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "&Öppna Plugins igen" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "&Felsökning" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "&Öppna Konfiguration..." #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "&Återställ Inställningar" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "F&önster" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Stäng" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "Stä&ng alla" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "Växla fil\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "&Ordna horisontellt" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "O&rdna vertikalt" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Överlappande" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Hjälp" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Innehåll...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "&Index..." #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "&Sök..." #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "R&eleasenoteringar" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "K&onfiguration..." -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "A&rkivstöd avstängt..." -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "GNU General Public License..." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&Om WinMerge..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Öppna Projekt...\tCtrl+J" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "V&änster fil skrivskyddad" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Hö&ger fil skrivskyddad" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "Fil&kodning" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "Välj &allt\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "Visa &identiska objekt" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "Visa &olika objekt" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "Visa v&änsterunika objekt" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Visa h&ögerunika objekt" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "Visa ö&verhoppade objekt" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "V&isa binära filer" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "Visa dold&a objekt" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "Jämfö&rstatistik" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "&Uppdatera\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Uppdatera valda\tCtrl+F5" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Jämför" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "Jä&mför\tEnter" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nästa skillnad\tAlt+Ner" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Föregående skillnad\tAlt+Upp" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Fö&rsta skillnad\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuell skillnad\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Sista skillnad\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiera till &höger\tAlt+Höger" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiera till &vänster\tAlt+Vänster" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "&Ta bort\tDelete" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "&Anpassa kolumner..." -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "Generera &rapport..." -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Spara\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "Spara &Vänster fil" -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Spara" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "Spara so&m..." -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "Spara &Höger fil" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "&Skriv ut..." -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "Utskrifts&format" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "Förhandsgranska u&tskrift" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "&Radslut (DOS, UNIX, MAC)" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "&DOS (CRLF)" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "&UNIX (LF)" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "&MAC (CR)" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "&Mergemod\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Ångra\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Gör om\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klipp ut\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "K&opiera\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "K&listra in\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "Markera skillnad &på rad\tF4" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "S&ök...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Ersätt...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Script" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Inga >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "Avancerat" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiera med radnummer\tCtrl+Shift+C" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "&Bokmärken" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Växla Bokmärke\tCtrl+F2" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nästa Bokmärke\tF2" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Tidigare Bokmärke\tShift+F2" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "&Ta bort alla Bokmärken" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gå till...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "Syntaxmarkering" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "&Lås placering" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "Visa &mellanslag" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "Visa &radskillnader" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "Visa rad&nummer" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "Visa &marginaler" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "R&adbryt rader" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "Vä&xla placering" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Skillnadsfält" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Skillnadsbild" -#: Merge.rc:428 +#: Merge.rc:430 #, 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:429 +#: Merge.rc:431 #, 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:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "Kopiera allt &till höger" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "Kopiera allt t&ill vänster" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "Jäm&för" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "Jä&mför Special" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "&Vänster till höger" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "V&änster till..." -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "&Höger till vänster" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "H&öger till..." -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "&Flytta" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "&Vänster till..." -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "&Höger till..." -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "&Ta bort" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "&Vänster" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "&Höger" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "&Båda" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "Byt &namn" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "&Dölj filnamn" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "&Öppna vänster" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "Ö&ppna höger" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "Kop&iera Sökvägar" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "&Vänster (%1 av %2)" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "&Höger (%1 av %2)" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "&Båda (%1 av %2)" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "Kopiera &Filnamn" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Vänster... (%1 av %2)" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Höger... (%1 av %2)" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Båda... (%1 av %2)" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Skillnader... (%1 av %2)" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "&Uppdatera" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "Kopiera hela sökvägen" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "Kopiera Filnamn" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "Prediffer-inställningar" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "&Ingen Prediffer" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "Automatisk Prediffer" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "G&å till skillnad" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "&Inga Flyttade Block" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "&Alla Flyttade Block" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttat Block för &Aktuell Skillnad" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "(Privat kompilering)" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "Med ensamrätt" -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besök WinMerges hemsida !" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "Medarbetare" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "Välj filer eller kataloger..." -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "&Vänster:" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "&Bläddra..." -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "&Höger:" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "B&läddra..." -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "Välj..." -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "&Uppackare:" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "Välj..." -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "&Inkludera Underkataloger" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "Avbryt" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "Hjälp" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller kataloger som skall jämföras" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "Databas:" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "Användare:" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "Lösenord:" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "Länka till valt VSS-projekt" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "Tillämpa på alla objekt" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "Checka ut" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "Spara som..." -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "Versionsstyrningssystem" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "&Versionsstyrningssystem:" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sökväg till Cleartool.exe:" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "Generellt" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "Gå automati&skt till första skillnaden" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "&Visa inte Startskärm" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "St&äng fönster med ESC" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifiera sökvägar i Öppna-dialogen" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "&Tillåt bara en upplaga att köra" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "Frå&ga när flera fönster stängs" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "&Bevara Filtidsuppgifter i Filjämförelse" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Ö&ppna-dialog Auto-Komplettera:" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "Starta flera jämförfönster för" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "&Jämför kataloger" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "Jäm&för filer" -#: Merge.rc:768 +#: Merge.rc:771 #, 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:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "Återställ" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "Språk" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "Tillgängliga språk:" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "Sök" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "S&ök efter:" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "Matcha &hela ord" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "Mat&cha VERSALER och gemener" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "&Reguljärt uttryck" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "V&änd inte vid slutet av filen" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "Riktning" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "&Upp" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "&Ner" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "&Sök nästa" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "Ersätt" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "Ersä&tt med:" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "Vänd inte vid slutet av filen" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "Ersätt i" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "&Markering" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "He&la filen" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "&Ersätt" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "Ersätt &alla" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "Checka ut" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "Checka in efter Checka ut" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "Radfilter" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "Använd Radfilter" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguljära uttryck (ett per rad):" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "Spara" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "Ny" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "Ändra" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "Ta bort" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "Kulörer" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "Skillnader:" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "Markerade skillnader:" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "Bakgrund" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "Borttaget" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "Ignorerad Skillnad:" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "Flyttad:" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "Markerad flyttad:" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "Ordskillnad:" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "Vald ordskillnad:" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "Standard" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "System" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Skicka borttagna filer till Papperskorgen" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignorera tidsskillnad mindre än 3 sekunder" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "Integration" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "Lägg till i Utforskarens popup-meny" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "A&nvänd avancerad meny" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "In&kludera underkataloger som standard" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "Extern Editor:" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "&Filterkatalog:" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "Bläddra..." -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "Patchgenerator" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "Fil &1:" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "Fil &2:" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "Bläddra..." -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "Byt" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "Lägg till i befintlig fil" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "T&yp:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "Samman&hang:" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "&Mellanslag" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "&Jämför" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "Ignorera skillnader" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "Ignorera alla" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorera blanka rader" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "VERSAL/gemen-känslig" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "Inklu&dera kommandorad" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "Öppna i Extern editor" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "Visa kolumner" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "Flytta &Upp" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "Flytta &Ned" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "Välj Uppackare" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "Fil-uppackare:" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Visa alla uppackare, kontrollera inte filsuffixet" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "Filsuffixlista:" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "Beskrivning:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "Katalogjämförelsens fortskridande" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "Stopp" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "Jämför objekt..." -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "Jämförda objekt:" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "Objekt totalt:" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "Gå till" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "G&å till:" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "Gå till rad" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "Ra&d" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "&Skillnad" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "&Gå till" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "Jämför" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "Mellanslag" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "Jämför &mellanslag" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "&Ignorera mellanslagsskillnader " -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "Ignorera &alla mellanslag" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorera blan&ka rader" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "&Ignorera VERSAL/gemen-skillnader" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "Igno&rera skillnader i radslut (DOS/UNIX/MAC)" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "M&öjliggör detektion av flyttade textblock" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "&Matcha liknande rader" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "&Filjämförelsemetod:" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "S&toppa efter första skillnaden" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "Filterkommentarer" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "&Markera syntaxen" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &uppdatering" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "Tabbar" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "&Tabbsteg:" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "Infoga tabbar" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "Infoga mellanslag" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "Radskillnadskulörer" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "Visa radskillnader" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "&Teckennivå" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "&Ordnivå:" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "Filfilter" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "Testa" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "Installera..." -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "Redigera..." -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "Ta bort..." -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "Spara ändrade filer?" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "Vänster fil" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "&Spara ändringar" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "&Ignorera ändringar" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "Höger fil" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "S¶ ändringar" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "Ign&orera ändringar" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "Ignorera alla ändringar" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "Codepage" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "Standard Codepage" -#: Merge.rc:1252 +#: Merge.rc:1255 #, 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:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2006,32 +2013,32 @@ msgstr "" "Detektera Codepageinformation för dessa filer : .html, .rc, .xml \n" "Detta kräver en omstart av WinMerge" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "System Codepage" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "Enligt WinMerges användargränssnitt" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "Anpassad Codepage :" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Arkivstöd är avstängt" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Kan inte detektera 7-Zip-version (är 7-Zip inte installerat?)" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2040,12 +2047,12 @@ msgstr "" "Arkivstöd kräver antingen att version 3.11 eller högre av 7-Zip är installerat på din dator, eller att dess\n" "nödvändiga komponenter kopieras till WinMerges programkatalog för fristående användning." -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Det måste också finnas ett lämpligt gränssnittsplugin (Merge7z*.dll) i sökvägen." -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2054,12 +2061,12 @@ msgstr "" "Var god och använd den version av 7-Zip som rekommenderas nedanför tills gränssnittsplugins för senare\n" "versioner blir tillgängliga." -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "Version" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" @@ -2068,54 +2075,54 @@ msgstr "" "Plugin krävd\n" "(dllbuild %04u)" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Rekommenderad version av 7-Zip:" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "finns" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip program installerat på din dator:" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "inget" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "saknas" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip komponenter för fristående användning:" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "utdaterad" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "Plugins i sökväg:" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" @@ -2124,486 +2131,486 @@ msgstr "" "Visa inte detta &meddelande igen.\n" "(Du kan alltid få tillbaka detta meddelande från Hjälp-menyn.)" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "Ladda ner Plugin" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "Inställningar" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr " Kategorier" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "Importera..." -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "Exportera..." -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "Nyckelord:" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "Funktionsnamn:" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "Kommentarer:" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "Nummer:" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "Operatorer:" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "Strängar:" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "Preprocessor:" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "Användare 1:" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "Användare 2:" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "Fet" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "Rapport för Katalogjämförelse" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "Rapport&fil:" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiera till klippbordet" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "Delat eller privat filter?" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "Vilken typ av filter vill du skapa?" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Delat filter (för alla användare på denna dator)" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "Privat filter (bara för den aktuella användaren)" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "Arkivstöd" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Arkivstödet kräver att 7-Zip-plugin är installerad:" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "Ladda ner 7-zip-plugin" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "&Aktivera arkivfilstöd" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Använd fristående 7-Zip om det finns" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "A&nvänd lokal 7-Zip från WinMerges katalog" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detektera arkivtyp från filsignatur" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "Jämförelsestatistik" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "Kataloger:" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "Filer:" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "Olika" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "Binär:" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "Unik" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "Vänster:" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "Höger:" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "Identisk" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "Totalt:" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "Stäng" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "Påverkar" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "(Påverkar)" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "Välj Codepage för" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "&Filöppnande:" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "Filsparande:" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "&Använd samma Codepage för båda" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "&Verkställ" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "&Avbryt" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "Testa Filter" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "Testar filter ..." -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "&Skriv in text att testa:" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "&Katalognamn" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "&Testa" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "&Stäng" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "&Använd anpassade textkulörer" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "Anpassade textkulörer" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "Mellanslag:" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "Vanlig text:" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "Markering:" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "Sökvägar" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "Bara& läsbar" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "Bara& läsbar" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "Öppna..." -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "Spara..." -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "Backup på filer" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "&Originalfilens katalog" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "&Global backupkatalog:" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "Backupfilnamn:" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "&Lägg till filsuffixet .bak" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "L&ägg till tidsmarkering" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "Bekräfta kopiering" -#: Merge.rc:1625 +#: Merge.rc:1628 #, 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:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "Från vänster" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "Till höger" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "Nej" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041d04e4" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Översatt av Göran Håkansson, bidrag från Hans Eriksson" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x41d, 1252" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" @@ -2612,7 +2619,7 @@ msgstr "" "Skapar nya dokument\n" "Nya Dokument (Ctrl+N)" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" @@ -2621,7 +2628,7 @@ msgstr "" "Öppnar ett befintligt dokument\n" "Öppna (Ctrl+O)" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" @@ -2630,7 +2637,7 @@ msgstr "" "Stänger det aktiva dokumentet\n" "Stäng" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" @@ -2639,7 +2646,7 @@ msgstr "" "Sparar det aktiva dokumentet\n" "Spara (Ctrl+S)" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" @@ -2648,7 +2655,7 @@ msgstr "" "Sparar det aktiva dokumentet med ett nytt namn\n" "Spara som" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" @@ -2657,7 +2664,7 @@ msgstr "" "Ändrar Utskriftsinställningar\n" "Sidinställningar" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" @@ -2666,7 +2673,7 @@ msgstr "" "Ändrar skrivare och skrivarinställningar\n" "Skrivarinställningar" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" @@ -2675,7 +2682,7 @@ msgstr "" "Skriver ut det aktiva dokumentet\n" "Skriv ut" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" @@ -2684,12 +2691,12 @@ msgstr "" "Visar helsidor\n" "Förhandsgranska" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "Gör alla dolda objekt synliga igen" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" @@ -2698,32 +2705,32 @@ msgstr "" "Öppna Projektfil\n" "Projektfil(Ctrl+J)" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "Okänt fel vid försök att öppna Projektfil" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "Okänt fel vid försök att spara Projektfil" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "Projektfil" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "Projektfilen är framgångsrikt öppnad." -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "Projektfilen är framgångsrikt sparad." -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2732,7 +2739,7 @@ msgstr "" "Sparar aktuella sökvägar och inställningar till Projektfil\n" "Spara Projektfil" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2741,7 +2748,7 @@ msgstr "" "Visar Programinformation, Versionsnummer och Copyright\n" "Om" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2750,9 +2757,6 @@ msgstr "" "Avslutar WinMerge och frågar om du vill spara dokument\n" "Avsluta" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2766,11 +2770,14 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "Öppna det här dokumentet" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" @@ -2779,7 +2786,7 @@ msgstr "" "Växlar till nästa fönster\n" "Nästa fönster" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2788,7 +2795,7 @@ msgstr "" "Växlar till förra fönstret\n" "Förra fönstret" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" @@ -2797,7 +2804,7 @@ msgstr "" "Öppnar ett nytt fönster med det aktiva dokumentet\n" "Nytt fönster" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" @@ -2806,7 +2813,7 @@ msgstr "" "Arrangerar ikonerna i nederkant av fönstret\n" "Arrangera ikoner" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2815,7 +2822,7 @@ msgstr "" "Arrangerar fönstren så att de överlappar varandra\n" "Överlappande fönster" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2824,7 +2831,7 @@ msgstr "" "Ordnar fönstren icke-överlappande horisontellt\n" "Ordna horisontellt" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2833,7 +2840,7 @@ msgstr "" "Ordnar fönstren icke-överlappande vertikalt\n" "Ordna vertikalt" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" @@ -2842,7 +2849,7 @@ msgstr "" "Delar det aktiva fönstret\n" "Dela" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" @@ -2851,7 +2858,7 @@ msgstr "" "Tar bort den markerade texten\n" "Ta bort" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" @@ -2860,7 +2867,7 @@ msgstr "" "Tar bort allt\n" "Ta bort allt" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2869,7 +2876,7 @@ msgstr "" "Kopierar den markerade texten och lägger det i klippbordet\n" "Kopiera" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2878,7 +2885,7 @@ msgstr "" "Klipper ut den markerade texten och lägger det i klippbordet\n" "Klipp ut" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" @@ -2887,7 +2894,7 @@ msgstr "" "Söker den angivna texten\n" "Sök" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2896,7 +2903,7 @@ msgstr "" "Klistrar in innehållet i klippbordet\n" "Klistra in" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" @@ -2905,7 +2912,7 @@ msgstr "" "Upprepar den senaste åtgärden\n" "Upprepa" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" @@ -2914,7 +2921,7 @@ msgstr "" "Ersätter den markerade texten med annan text\n" "Ersätt" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" @@ -2923,7 +2930,7 @@ msgstr "" "Väljer hela dokumentet\n" "Välj allt" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" @@ -2932,7 +2939,7 @@ msgstr "" "Ångrar den senaste åtgärden\n" "Ångra" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" @@ -2941,7 +2948,7 @@ msgstr "" "Gör om den tidigare ångrade åtgärden\n" "Gör om" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2950,7 +2957,7 @@ msgstr "" "Visar eller gömmer verktygsfältet\n" "Växla verktygsfält" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" @@ -2959,7 +2966,7 @@ msgstr "" "Visar eller gömmer statusfältet\n" "Växla statusfältet" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2968,62 +2975,62 @@ msgstr "" "Visar eller gömmer filraden\n" "Växla filraden" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Automatisk storleksändring av placering\nLås Placering" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "Ändra fönsterstorlek" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "Flytta fönster" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "Minimera fönstret till en ikon" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "Maximera fönstret till full storlek" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "Växla till nästa dokumentfönster" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "Växla till förra dokumentfönstret" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Stäng det aktiva fönstret och fråga om dokumenten skall sparas" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "Återställ fönstret till normal storlek" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "Lista med aktiva fönster" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "Aktiverar det här fönstret" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" @@ -3032,7 +3039,7 @@ msgstr "" "Stänger Förhandsgranskning\n" "Stäng Förhandsgranskning" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -3051,23 +3058,23 @@ msgstr "" "WinMerge.Dokument\n" "WinMerge Dokument" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "Tryck på en valfri tangent" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "Högerklicka på sökvägen för att kopiera" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" @@ -3076,152 +3083,152 @@ msgstr "" "Utvecklare:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 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 Public License i Hjälpmenyn för detaljer." -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "&Försök igen" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "&Ignorera" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "Ignorera &allt" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "Ja till &allt" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "Nej till a&llt" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "&Fortsätt" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "&Skippa" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "Skippa &allt" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "Visa inte detta &meddelande igen." -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "Fråga inte denna &fråga igen." -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "Syntaxkulörer" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "Textkulörer" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "Versionskontroll" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "Till:" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "Från vänster:" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "Till vänster:" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "Från höger:" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "Till höger:" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "Version %1" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "Egenskaper (%1)" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "Alla meddelanderutor visas nu igen." -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Ändringar har gjorts i den aktuella filjämförelsesessionen. Vissa inställningar kanske inte syns förrän den aktuella filjämförelsen startas om." -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Ändringen av typsnitt kommer inte att synas i redan öppna fönster." -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3232,7 +3239,7 @@ msgstr "" "\n" "Var god och använd värden från 1 - %1." -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3243,107 +3250,107 @@ msgstr "" "\n" "Var god och återstarta WinMerge efter återställningen." -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "Öppna" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programfiler|*.exe;*.bat;*.cmd|Alla Filer (*.*)|*.*||" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alla filer (*.*)|*.*||" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Inställningsfiler (*.ini)|*.ini|Alla Filer (*.*)|*.*||" -#: Merge.rc:1950 +#: Merge.rc:1953 #, 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:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alla filer (*.*)|*.*||" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "Total jämförelse" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "Snabb jämförelse" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "Datum för förändring" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "Ändrat Datum och Storlek" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "Filstorlek" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "Namn" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "Sökväg" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "Beskrivning" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "Välj filnamn för nytt filter" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfilter (*.flt)|*.flt|Alla Filer (*.*)|*.*||" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3356,7 +3363,7 @@ msgstr "" "Var god och kopiera filen %1 till WinMerges Filterkatalog:\n" "%2." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3369,7 +3376,7 @@ msgstr "" "\n" "Var god och verifiera att katalogen finns och att den är skrivbar." -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3380,7 +3387,7 @@ msgstr "" "\n" "Var god och välj filterkatalog i Inställningar/System." -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3393,12 +3400,12 @@ msgstr "" "\n" "Kanske är filen bara läsbar?" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "Ange sökväg för filterfil att installera" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3409,208 +3416,208 @@ msgstr "" "\n" "Kunde inte kopiera ny filterfil till filterkatalogen." -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterfilen är redan installerad. Vill du skriva över existerande filterfil?" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "Reguljära uttryck" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Sökväg till Cleartool.exe:" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "&Sökväg till SS.EXE:" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "Resultat för jämförda kataloger" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "Filjämförelse" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "Namnlös vänster" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "Namnlös höger" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "Söker filer..." -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "Öppnar val" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "Kopiera vänster till höger" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "Kopiera höger till vänster" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "Kopiera allt till vänster" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "Kopiera allt till höger" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "Kopierar filer..." -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "Tar bort filer..." -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "Flyttar filer..." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "Skapar rapport..." -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Rad: %s Kolumn: %d/%d Tecken: %d/%d Radslut: %s" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "Rad: %s" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Rad: %s Kolumn: %d/%d Tecken: %d/%d" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "Mergemod" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "Skillnad %1 av %2" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "%1 skillnader funna" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "1 skillnad funnen" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "Objekt: %1" -#: Merge.rc:2052 +#: Merge.rc:2055 #, 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:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "Val av katalog" -#: Merge.rc:2054 +#: Merge.rc:2057 #, 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:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "Vänster sökväg är felaktig!" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "Höger sökväg är felaktig!" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "Båda sökvägarna är felaktiga!" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Välj två filer för att starta valet av uppackare." -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan inte jämföra en fil med en katalog!" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "Kan inte hitta: %1" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "Filen är inte uppackad: %1" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3623,7 +3630,7 @@ msgstr "" "\n" "är identiska binära filer." -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3636,7 +3643,7 @@ msgstr "" "\n" "är olika binära filer." -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3647,7 +3654,7 @@ msgstr "" "\n" "är en binär fil. Kan inte jämföra binära filer med textfiler." -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3660,37 +3667,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "Spara som" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "Spara ändringar i %1?" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "Fel vid kontroll av skrivbarhet på destinationen!" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "Fel vid backup av filen" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3703,7 +3710,7 @@ msgstr "" "\n" "Vill du fortsätta i alla fall?" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3720,7 +3727,7 @@ msgstr "" "\t-använda ett annat filnamn (Tryck Ok)\n" "\t-avbryta sparande av fil (Tryck Avbryt)?" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3735,7 +3742,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3750,7 +3757,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3765,7 +3772,7 @@ msgstr "" "\n" "Vill du skriva över den förändrade filen?" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" @@ -3774,7 +3781,7 @@ msgstr "" "%1\n" "är markerad bara läsbar. Vill du ändå ändra i den?" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3789,17 +3796,17 @@ msgstr "" "\n" "Om du vill uppdatera filer stäng aktuell filjämförelse och öppna filer igen." -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "Spara vänster fil som" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "Spara höger fil som" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3810,42 +3817,42 @@ msgstr "" "\n" "Uppdatera filerna innan du fortsätter." -#: Merge.rc:2103 +#: Merge.rc:2106 #, 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:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "Hämtar filer från VSS..." -#: Merge.rc:2105 +#: Merge.rc:2108 #, 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:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "Fel vid utförande av kommando för versionshanteringssystem." -#: Merge.rc:2107 +#: Merge.rc:2110 #, 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:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS databas hittad!" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "Fel från VSS:" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3856,7 +3863,7 @@ msgstr "" " Var god och, kontrollera konfigurationsspecifikation på använd markering.\n" " Ångra checka ut åtgärd?" -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3865,179 +3872,179 @@ 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "Inget" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (lägre än 5.0)" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 eller högre)" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "Radbryt på mellanslag" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "Radbryt på mellanslag eller punkt" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiera valt objekt till angiven katalog" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiera valt objekt till anpassad katalog" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "Ta bort valda objekt på vänster sida" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "Ta bort valda objekt på höger sida" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Ta bort valda objekt på båda sidor" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Dölj valda objekt (realtidsfilter)" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "Byt namn på valt objekt på båda sidor" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "Höger till vänster (%1)" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "Vänster till höger (%1)" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Höger till vänster (%1 av %2)" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Vänster till höger (%1 av %2)" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "Vänster till... (%1)" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "Höger till... (%1)" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "Vänster till... (%1 av %2)" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "Höger till... (%1 av %2)" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "Vänster (%1)" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "Höger (%1)" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "Båda (%1)" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "Vänster (%1 av %2)" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "Höger (%1 av %2)" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "Båda (%1 av %2)" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "Välj destinationskatalog" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "Vänster sida - välj destinationskatalog:" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "Höger sida - välj destinationskatalog:" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påverkade)" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 av %2 filer påverkade)" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "Är du säker på att du vill kopiera alla skillnader till den vänstra filen?" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "Är du säker på att du vill kopiera alla skillnader till den högra filen?" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -4052,17 +4059,17 @@ msgstr "" "till\n" "%2 ?" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "Är du säker på att du vill kopiera %1 av %2 valda objekt?" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "Är du säker på att du vill ta bort %1 av %2 valda objekt?" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -4073,7 +4080,7 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4084,17 +4091,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "Är du säker på att du vill kopiera:" -#: Merge.rc:2178 +#: Merge.rc:2181 #, 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:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -4113,458 +4120,458 @@ msgstr "" "\n" "Var god och uppdatera jämförelsen." -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "Öppna den vänstra filen" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "Öppna den vänstra filen med en extern editor" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "Öppna den vänstra filen med ..." -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "Öppna den högra filen" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "Öppna den högra filen med en extern editor" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "Öppna den högra filen med ..." -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunde inte starta den externa editorn %1" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Okänt suffix för extern editor: %1" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiera filnamn till klippbordet" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiera vänster sidas sökvägar till klippbordet" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiera höger sidas sökvägar till klippbordet" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiera båda sidors sökvägar till klippbordet" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "Okänt arkivformat" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "Lägg till objekt från vänster sida till arkivet" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "Lägg till objekt från höger sida till arkivet" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "Lägg till objekt från båda sidor till arkivet" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "Lägg till olika objekt till arkivet (från båda sidor)" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "Flytta vald fil till vänster till anpassad katalog" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "Flytta vald fil till höger till anpassad katalog" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "Filnamn" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "Katalog" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "Resultat av jämförelsen" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "Vänster datum" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "Höger datum" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "Filsuffix" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "Vänster storlek" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "Höger storlek" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "Höger Filstorlek (Förkortad)" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "Vänster Filstorlek (Förkortad)" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "Vänster skapaddatum" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "Höger skapaddatum" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "Nyare filer" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "Filversion på vänster fil" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "Filversion på höger fil" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "Vänster attribut" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "Höger attribut" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "Vänster radslutstyp" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "Höger radslutstyp" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "Vänster kodning" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "Höger kodning" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "Ignorerade skillnader" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "Skillnader" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "Binär" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "Kan inte jämföra filerna" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "Objekt avbrutet" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "Hoppat över filen" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "Hoppat över katalogen" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "Bara vänster: %1" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "Bara höger: %1" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "De binära filerna är identiska" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "De binära filerna är olika" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "Filerna är olika" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "Endast vänster" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "Endast höger" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "Fel" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "Förfluten tid: %ld ms" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "1 objekt valt" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "%1 objekt valda" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "Filnamn eller katalognamn." -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Underkatalognamn när underkataloger inkluderas." -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "Jämförelseresultat, lång version." -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "Vänster sidas ändringsdatum." -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "Höger sidas ändringsdatum." -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "Filsuffix." -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "Vänster fils storlek i bytes." -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "Höger fils storlek i bytes." -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "Vänster filstorlek är förkortad." -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "Höger filstorlek är förkortad." -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "Vänster sidas skapelsetid." -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "Höger sidas skapelsetid." -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "Visar vilken sida som har ett nyare ändringsdatum." -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Vänster sidas filversion, bara för några filtyper." -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Höger sidas filversion, bara för några filtyper." -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "Kortfattat jämförelseresultat." -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "Vänster sidas attribut." -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "Höger sidas attribut." -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "Vänster sidas filradslutstyp" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "Höger sidas filradslutstyp" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "Vänster sidas kodning." -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "Höger sidas kodning." -#: Merge.rc:2315 +#: Merge.rc:2318 #, 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:2316 +#: Merge.rc:2319 #, 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:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Visar stjärna (*) om filen är binär." -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "Jämför %1 med %2" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "Komma-separerad lista" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "Tabb-separerad lista" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "Enkel HTML" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:2329 +#: Merge.rc:2332 #, 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:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" @@ -4573,47 +4580,47 @@ msgstr "" "Fel vid skapande av rapport:\n" "%1" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "Rapporten har skapats." -#: Merge.rc:2337 +#: Merge.rc:2340 #, 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:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "De valda filerna är identiska." -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "Den valda katalogen finns bara på andra sidan och kan därför inte öppnas." -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "Ett fel inträffade under jämförelsen av filerna." -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "Binära filer kan inte jämföras visuellt." -#: Merge.rc:2342 +#: Merge.rc:2345 #, 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:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "Kataloger kan inte jämföras visuellt." -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4628,7 +4635,7 @@ msgstr "" "\n" "OBS: Om du alltid vill betrakta alla radslutstyper som likvärdiga, markera alternativet 'Ignorera skillnader i radslut (DOS,UNIX,MAC)' i Jämför-fliken i Inställningar-dialogen (finns under Redigera/Inställningar)." -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4639,22 +4646,22 @@ msgstr "" " Med de aktuella inställningarna, kommer de att ändras till den vanligaste typen.\n" " Vill du ändra i inställningarna och bevara de olika radsluten ?" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Ett fel uppstod vid prediffing av filen '%1' med plugin '%2'. Prediffing används inte mer." -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "Den valda katalogen är ogiltig." -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan inte öppna en binär fil för att editera." -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4665,132 +4672,132 @@ 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:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Varning: Filerna använder olika filkodningar, vänster=%s och höger=%s, och sammanfogning kan leda till förlust av information." -#: Merge.rc:2356 +#: Merge.rc:2359 #, 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:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Information förlorades på grund av kodningsfel i: höger fil" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Information förlorades på grund av kodningsfel i: vänster fil" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "Ingen skillnad" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "Radskillnad" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "Ersatt %1 sträng(ar)." -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan inte hitta strängen \"%s\"" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "Kopiera hela sökvägen" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "Kopiera filnamn" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "Skillnadsfält" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "Skillnadsbild" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "Patchfilen sparad." -#: Merge.rc:2393 +#: Merge.rc:2396 #, 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:2394 +#: Merge.rc:2397 #, 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:2395 +#: Merge.rc:2398 #, 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:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "[%1 fil(er) valda]" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "Sammanhang" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "Förenad" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "Kunde inte spara filen %1." -#: Merge.rc:2401 +#: Merge.rc:2404 #, 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:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "Välj ett filnamn för resultatet" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan inte skapa en patchfil från binära filer." -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan inte skapa en patchfil från kataloger." -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4801,17 +4808,17 @@ msgstr "" "\n" "Att skapa en patch kräver att det inte finns några osparade förändringar i filerna." -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "Katalogen finns inte." -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Aktuella katalogjämförelseresultat kommer att tas bort." -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4822,7 +4829,7 @@ 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:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" @@ -4831,7 +4838,7 @@ msgstr "" "\n" "Notera: 7-Zip integration är avstängd i WinMerges inställningar." -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" @@ -4840,37 +4847,37 @@ msgstr "" "\n" "Notera: 7-Zip integration är begränsad till fristående användning i WinMerges inställningar." -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "Välj fil att exportera" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "Välj fil att importera" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "Inställningar importerades från filen." -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "Inställningar exporterades till filen." -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "Det gick inte att importera inställningar från filen." -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "Det gick inte att spara inställningar till filen." -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4881,1098 +4888,1098 @@ msgstr "" "\n" "Vill du göra detta?" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "Fel i reguljärt uttryck" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "Ingen träff" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "Ogiltigt reguljärt uttryck" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "Ogiltigt repetitionstecken" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "Ogiltigt teckenklassnamn" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "Bakåtlutat snedstreck sist på en rad" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "Felaktig bakåtreferens" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "Inte matchande [ eller [^" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "Inte matchande ( eller \\(" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "Inte matchande \\{" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "Felaktigt innehåll av \\{\\}" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "Felaktigt intervallslut" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "Slut på minne" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "Ogiltigt föregående reguljärt uttryck" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "För tidigt slut på reguljärt uttryck" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "Reguljärt uttryck är för stort" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "Inte matchande ) eller \\)" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "Afrikaans" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "Albanska" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "Arabiska (Saudiarabien)" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "Arabiska (Irak)" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "Arabiska (Egypten)" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "Arabiska (Libyen)" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "Arabiska (Algeriet)" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "Arabiska (Marocko)" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "Arabiska (Tunisien)" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "Arabiska (Oman)" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "Arabiska (Jemen)" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "Arabiska (Syrien)" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "Arabiska (Jordanien)" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "Arabiska (Libanon)" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "Arabiska (Kuwait)" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "Arabiska (Förenade Arabemiraten)" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "Arabiska (Bahrain)" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "Arabiska (Qatar)" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "Armeniska" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "Azerbajdzjanska (Latinsk)" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "Azerbajdzjanska (Kyrillisk)" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "Baskiska" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "Vitryska" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "Bulgariska" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "Katalanska" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "Kinesiska (Traditionell)" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "Kinesiska (Förenklad)" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "Kinesiska (Hong Kong)" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "Kinesiska (Singapore)" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "Kinesiska (Macau SAR)" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "Kroatiska" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "Tjeckiska" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "Danska" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "Nederländska" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "Nederländska (Belgien)" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "Engelska (USA)" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "Engelska (Storbritannien)" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "Engelska (Australien)" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "Engelska (Kanada)" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "Engelska (Nya Zeeland)" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "Engelska (Irland)" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "Engelska (Sydafrika)" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "Engelska (Jamaica)" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "Engelska (Karibien)" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "Engelska (Belize)" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "Engelska (Trinidad)" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "Engelska (Zimbabwe)" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "Engelska (Filippinerna)" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "Estniska" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "Färöiska" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "Persiska" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "Finska" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "Franska" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "Franska (Belgien)" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "Franska (Canada)" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "Franska (Schweiz)" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "Franska (Luxemburg)" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "Franska (Monaco)" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "Georgiska" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "Tyska (Tyskland)" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "Tyska (Schweiz)" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "Tyska (Österrike)" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "Tyska (Luxemburg)" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "Tyska (Liechtenstein)" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "Grekiska" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "Hebriska" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "Hindi" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "Ungerska" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "Isländska" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "Indonesiska" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "Italienska" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "Italienska (Schweiz)" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "Japanska" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "Kashmiri (Indien)" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "Kazakiska" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "Koreanska" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "Koreanska (Johab)" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "Lettiska" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "Litauiska" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "Malajiska (Malaysia)" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "Malajiska (Brunei Darussalam)" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "Manipuri" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norska (Bokmål)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "Norska (Nynorsk)" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "Polska" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "Portugisiska" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "Portugisiska (Brasilien)" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "Rumänska" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "Ryska" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "Sanskrit" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "Serbiska (Latinsk)" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "Serbiska (Kyrillisk)" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "Sindhi" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "Slovakiska" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "Slovenska" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "Spanska" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "Spanska (Mexiko)" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "Spanska (Modern)" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "Spanska (Guatemala)" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "Spanska (Costa Rica)" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "Spanska (Panama)" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "Spanska (Dominikanska republiken)" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "Spanska (Venezuela)" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "Spanska (Colombia)" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "Spanska (Peru)" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "Spanska (Argentina)" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "Spanska (Ecuador)" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "Spanska (Chile)" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "Spanska (Uruguay)" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "Spanska (Paraguay)" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "Spanska (Bolivia)" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "Spanska (El Salvador)" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "Spanska (Honduras)" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "Spanska (Nicaragua)" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "Spanska (Puerto Rico)" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "Swahili (Kenya)" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "Svenska" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "Svenska (Finland)" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "Tamilska" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "Tatariska (Tatarstan)" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "Thailändska" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "Turkiska" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "Ukraniska" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "Urdu (Pakistan)" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "Urdu (Indien)" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "Uzbekiska (Latinsk)" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "Uzbekiska (Kyrillisk)" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "Vietnamesiska" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "Västeuropeisk" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "Östeuropeisk" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "Östasisk" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "Sydöst- och sydvästasiatisk" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "Mellanöstersk" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "Inte tillämplig" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Kyrillisk" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabiska" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grekiska" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltisk utkant" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grekisk 1" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Kyrillisk" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkiska" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugisiska" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Isländska" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreiska" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Franska (Kanadensisk)" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordisk" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Kyrillisk CIS 1" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grekisk 2" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "Windows Thailändska" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "Windows Japanska" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Förenklad Kinesiska" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "Windows Koreanska" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditionell Kinesiska" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Kyrillisk (Slavisk)" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "Windows Grekiska" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkiska)" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreiska" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "Windows Arabiska" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltisk utkant" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamesiska" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romersk" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grekiska" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Kyrillisk" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "Macintosh Centraleuropeisk" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Isländsk" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkiska" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "Liknar ISO-8859-2(Latin 2)" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "Liknar ISO-8859-1(Latin 1)" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "Liknar ISO-8859-7(Grekisk)" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "Liknar ISO-8859-9(Turkisk)" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "Liknar ISO-8859-8(Hebreisk)" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "DOS" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "MAC" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "UNIX" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "Blandad" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "Sparar den vänstra filen" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "Sparar den högra filen" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "Sparar den vänstra filen som..." -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "Sparar den högra filen som..." -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "Ändrar skrivskydd på vänster fil/katalog" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "Ändrar skrivskydd på höger fil/katalog" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "Konverterar radslut till DOS-format" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "Konverterar radslut till UNIX-format" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "Konverterar radslut till MAC-format" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "Växlar mellan Editeramod och Mergemod" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5981,12 +5988,12 @@ msgstr "" "Visar och ändrar filkodningsegenskaper\n" "Filkodningsegenskaper" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" @@ -5995,7 +6002,7 @@ msgstr "" "Markerar skillnad på aktuell rad\n" "Skillnad på aktuell rad" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" @@ -6004,7 +6011,7 @@ msgstr "" "Går till rad eller skillnad\n" "Gå till (Ctrl+G)" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" @@ -6013,7 +6020,7 @@ msgstr "" "Ändrar programinställningar\n" "Inställningar" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" @@ -6022,37 +6029,37 @@ msgstr "" "Uppdaterar innehållet\n" "Uppdatera (F5)" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopierar valda rader till klippboken och lägger till radnummer i början på raderna" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "Uppdaterar valda objekt" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "Växlar Bokmärke" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "Går till nästa Bokmärke" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "Går till tidigare Bokmärke" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "Tar bort alla Bokmärken" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -6061,7 +6068,7 @@ msgstr "" "Visar objekt som är exakt lika\n" "Visa identiska objekt" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" @@ -6070,7 +6077,7 @@ msgstr "" "Visar objekt som har skillnader\n" "Visa skillnader i objekt" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -6079,7 +6086,7 @@ msgstr "" "Visar objekt som bara finns på vänster sida\n" "Visa vänsterunika objekt" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -6088,7 +6095,7 @@ msgstr "" "Visar objekt som bara finns på höger sida\n" "Visa högerunika objekt" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" @@ -6097,7 +6104,7 @@ msgstr "" "Visar binära filer\n" "Visa binära filer" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" @@ -6106,7 +6113,7 @@ msgstr "" "Visar överhoppade objekt\n" "Visa överhoppade objekt" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" @@ -6115,7 +6122,7 @@ msgstr "" "Väljer typsnitt för fönstren\n" "Välj typsnitt" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -6124,27 +6131,27 @@ msgstr "" "Väljer standardtypsnitt för fönstren\n" "Välj standardtypsnitt" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "Visar ett tecken för mellanslag" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "Växla skillnadsbilden" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "Skillnadsbilden visar en övergripande bild av filerna" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "Visar dialog med katalogjämförelsestatistik" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" @@ -6153,7 +6160,7 @@ msgstr "" "Väljer språk för användargränssnittet\n" "Språk" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" @@ -6162,12 +6169,12 @@ msgstr "" "Visar skillnader inom rader med olika färg\n" "Visa radskillnad" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "Växlar placering på de två filerna" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" @@ -6176,7 +6183,7 @@ msgstr "" "Visar radnummer\n" "Visa radnummer" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" @@ -6185,7 +6192,7 @@ msgstr "" "Startar radbrytning\n" "Radbrytning" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -6194,17 +6201,17 @@ msgstr "" "Visar marginaler för båda filerna\n" "Visa filmarginaler" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" @@ -6213,7 +6220,7 @@ msgstr "" "Går till föregående skillnad\n" "Föregående skillnad (Alt+Upp)" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" @@ -6222,7 +6229,7 @@ msgstr "" "Går till nästa skillnad\n" "Nästa skillnad (Alt+Ner)" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" @@ -6231,7 +6238,7 @@ msgstr "" "Går till första skillnaden\n" "Första skillnad (Alt+Home)" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" @@ -6240,7 +6247,7 @@ msgstr "" "Går till aktuell skillnad\n" "Aktuell skillnad (Alt+Enter)" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" @@ -6249,7 +6256,7 @@ msgstr "" "Går till sista skillnaden\n" "Sista skillnad (Alt+End)" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -6258,7 +6265,7 @@ msgstr "" "Kopierar den valda texten till den högra filen\n" "Kopiera höger (Alt+Höger)" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -6267,7 +6274,7 @@ msgstr "" "Kopierar den valda texten till den vänstra filen\n" "Kopiera vänster (Alt+Vänster)" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -6276,7 +6283,7 @@ msgstr "" "Kopierar skillnad till höger och går fram till nästa\n" "Kopiera höger och gå framåt (Ctrl+Alt+Höger)" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -6285,7 +6292,7 @@ msgstr "" "Kopierar skillnad till vänster och går fram till nästa\n" "Kopiera vänster och gå framåt (Ctrl+Alt+Vänster)" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" @@ -6294,7 +6301,7 @@ msgstr "" "Kopierar alla skillnader till den högra filen\n" "Kopiera allt till höger" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" @@ -6303,72 +6310,72 @@ msgstr "" "Kopierar alla skillnader till den vänstra filen\n" "Kopiera allt till vänster" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "Tar bort valda objekt från båda katalogerna" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Jämför valt objekt (jämför första objektet om flera objekt är valda)" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "Välj och sortera om kolumnerna för katalogjämförelse" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "Skapar en patchfil" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "Väljer och ändrar filter" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "Genererar en rapport för jämförresultat" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Användaren väljer uppackare (ingen uppackning när man jämför kataloger)" -#: Merge.rc:2837 +#: Merge.rc:2840 #, 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:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "Välj en uppackare för att ändra i denna fil" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (standard)" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "Föreslagna plugins" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "Andra plugins" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Stäng alla plugins och öppna dem igen (för utvecklare)" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" @@ -6377,12 +6384,12 @@ msgstr "" "Växlar mellan höger och vänster fil\n" "Växla fil" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "Stänger alla öppna fönster" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" @@ -6391,22 +6398,22 @@ msgstr "" "Visar hjälpen för WinMerge\n" "Hjälp" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Sparar aktuell WinMerge Versionsinfo och Konfiguration till en textfil" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "Visar GNU General Public License" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "Privat Kompilering: %1" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" @@ -6415,7 +6422,7 @@ msgstr "" "Öppnar WinMerges Hjälpindex\n" "Hjälpindex" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" @@ -6424,267 +6431,272 @@ msgstr "" "Öppnar WinMerges Hjälpsökning\n" "Hjälpsökning" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "Öppnar Releasenoteringsdokumentet\nReleasenoteringar" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "Plugin Inställningar" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "Ingen prediffer" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "Prediffer om möjligt" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host ('wscript.exe') hittades inte - .sct script är avstängda" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "Öppna filen med registerat program" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "Öppna filen med extern editor" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "Öppna filen med ett speciellt program" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "Visa inte flyttade block" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "Visa alla flyttade block" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "Visa flyttade block bara från aktuell skillnad" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "Gå till skillnad under cursor" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G&å till skillnad %1 av %2" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "G&å till rad %1" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "Avstängd" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "Från Filsystem" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "Från Senast Använda filer" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "Portabelt Objekt" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "Resurser" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "Dölj verktygsraden" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "Visa liten verktygsrad" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "Visa stor verktygsrad" diff --git a/Src/Languages/Turkish.po b/Src/Languages/Turkish.po index 89f60c07a..9b6d2b246 100644 --- a/Src/Languages/Turkish.po +++ b/Src/Languages/Turkish.po @@ -71,7 +71,7 @@ msgstr "" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:495 +#: Merge.rc:498 #, c-format msgid "&Copy" msgstr "" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "" #: Merge.rc:84 -#: Merge.rc:576 +#: Merge.rc:579 #, c-format msgid "&Goto..." msgstr "" @@ -94,43 +94,43 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:518 -#: Merge.rc:524 +#: Merge.rc:521 +#: Merge.rc:527 #, c-format msgid "with &Registered Application" msgstr "" #: Merge.rc:89 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:522 +#: Merge.rc:528 #, c-format msgid "with &External Editor" msgstr "" #: Merge.rc:90 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "&with..." msgstr "" #: Merge.rc:110 -#: Merge.rc:190 -#: Merge.rc:305 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "&Dosya" #: Merge.rc:112 -#: Merge.rc:192 -#: Merge.rc:307 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "&Yeni\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:193 -#: Merge.rc:308 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Aç...\tCtrl+O" @@ -146,8 +146,8 @@ msgid "Open Project...\tCtrl+J" msgstr "" #: Merge.rc:117 -#: Merge.rc:196 -#: Merge.rc:311 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -158,2564 +158,2568 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:203 -#: Merge.rc:343 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "Çýký&þ" #: Merge.rc:123 -#: Merge.rc:205 -#: Merge.rc:345 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "&Düzen" #: Merge.rc:125 -#: Merge.rc:209 -#: Merge.rc:379 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "&Seçenekler..." #: Merge.rc:127 -#: Merge.rc:211 -#: Merge.rc:381 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "&Görünüm" #: Merge.rc:129 -#: Merge.rc:222 -#: Merge.rc:383 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "Fo&nt Seç" #: Merge.rc:130 -#: Merge.rc:223 -#: Merge.rc:384 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "&Varsayýlan Fontu Kullan" #: Merge.rc:132 -#: Merge.rc:225 -#: Merge.rc:401 +#: Merge.rc:226 +#: Merge.rc:403 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:227 -#: Merge.rc:403 +#: Merge.rc:228 +#: Merge.rc:405 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:228 -#: Merge.rc:404 +#: Merge.rc:229 +#: Merge.rc:406 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:229 -#: Merge.rc:405 +#: Merge.rc:230 +#: Merge.rc:407 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:231 -#: Merge.rc:407 +#: Merge.rc:232 +#: Merge.rc:409 #, c-format msgid "&Status Bar" msgstr "Durum Çubuðu" #: Merge.rc:139 -#: Merge.rc:232 -#: Merge.rc:408 +#: Merge.rc:233 +#: Merge.rc:410 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:235 -#: Merge.rc:412 +#: Merge.rc:236 +#: Merge.rc:414 #, c-format msgid "&Language..." msgstr "&Dil" #: Merge.rc:143 -#: Merge.rc:256 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:436 #, c-format msgid "&Tools" msgstr "&Araçlar" #: Merge.rc:145 -#: Merge.rc:259 -#: Merge.rc:436 +#: Merge.rc:260 +#: Merge.rc:438 #, c-format msgid "&Filters..." msgstr "&Filtreler" #: Merge.rc:146 -#: Merge.rc:260 -#: Merge.rc:437 +#: Merge.rc:261 +#: Merge.rc:439 #, c-format msgid "&Generate Patch..." msgstr "&Yama Üret..." #: Merge.rc:148 -#: Merge.rc:263 -#: Merge.rc:440 +#: Merge.rc:264 +#: Merge.rc:442 #, c-format msgid "&Plugins" msgstr "&Eklentiler" #: Merge.rc:150 -#: Merge.rc:265 -#: Merge.rc:442 +#: Merge.rc:266 +#: Merge.rc:444 #, c-format msgid "&Manual Unpacking" msgstr "&Manuel Açmak" #: Merge.rc:151 -#: Merge.rc:266 -#: Merge.rc:443 +#: Merge.rc:267 +#: Merge.rc:445 #, c-format msgid "&Automatic Unpacking" msgstr "&Otomatik Açmak" #: Merge.rc:153 -#: Merge.rc:268 -#: Merge.rc:445 +#: Merge.rc:269 +#: Merge.rc:447 #, c-format msgid "&Edit with Unpacker" msgstr "&Açýcýyla Düzenler" #: Merge.rc:155 -#: Merge.rc:270 -#: Merge.rc:452 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format msgid "&Reload plugins" msgstr "Eklentileri &Tekrar Yükle" #: Merge.rc:157 -#: Merge.rc:272 -#: Merge.rc:454 +#: Merge.rc:273 +#: Merge.rc:456 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:159 -#: Merge.rc:274 -#: Merge.rc:456 +#: Merge.rc:275 +#: Merge.rc:458 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:160 -#: Merge.rc:275 -#: Merge.rc:457 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:162 -#: Merge.rc:277 -#: Merge.rc:459 +#: Merge.rc:278 +#: Merge.rc:461 #, c-format msgid "&Window" msgstr "Pencereler" #: Merge.rc:164 -#: Merge.rc:279 -#: Merge.rc:461 +#: Merge.rc:280 +#: Merge.rc:463 #, c-format msgid "Cl&ose" msgstr "&Kapat" #: Merge.rc:165 -#: Merge.rc:280 -#: Merge.rc:462 +#: Merge.rc:281 +#: Merge.rc:464 #, c-format msgid "Clo&se All" msgstr "" #: Merge.rc:167 -#: Merge.rc:282 -#: Merge.rc:464 +#: Merge.rc:283 +#: Merge.rc:466 #, c-format msgid "Change &Pane\tF6" msgstr "&Pencere Deðitir\tF6" #: Merge.rc:169 -#: Merge.rc:284 -#: Merge.rc:466 +#: Merge.rc:285 +#: Merge.rc:468 #, c-format msgid "Tile &Horizontally" msgstr "&Yatay Döþe" #: Merge.rc:170 -#: Merge.rc:285 -#: Merge.rc:467 +#: Merge.rc:286 +#: Merge.rc:469 #, c-format msgid "Tile &Vertically" msgstr "&Dikey Döþe" #: Merge.rc:171 -#: Merge.rc:286 -#: Merge.rc:468 +#: Merge.rc:287 +#: Merge.rc:470 #, c-format msgid "&Cascade" msgstr "&Sýrala" #: Merge.rc:173 -#: Merge.rc:288 -#: Merge.rc:470 -#: Merge.rc:1884 +#: Merge.rc:289 +#: Merge.rc:472 +#: Merge.rc:1887 #, c-format msgid "&Help" msgstr "&Yardým" #: Merge.rc:175 -#: Merge.rc:290 -#: Merge.rc:472 +#: Merge.rc:291 +#: Merge.rc:474 #, c-format msgid "&Contents...\tF1" msgstr "&Ýçerik...\tF1" #: Merge.rc:176 -#: Merge.rc:291 -#: Merge.rc:473 +#: Merge.rc:292 +#: Merge.rc:475 #, c-format msgid "&Index..." msgstr "" #: Merge.rc:177 -#: Merge.rc:292 -#: Merge.rc:474 +#: Merge.rc:293 +#: Merge.rc:476 #, c-format msgid "&Search..." msgstr "" #: Merge.rc:179 -#: Merge.rc:294 -#: Merge.rc:476 +#: Merge.rc:295 +#: Merge.rc:478 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:295 -#: Merge.rc:477 +#: Merge.rc:296 +#: Merge.rc:479 +#, c-format +msgid "&Translations" +msgstr "" + +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:480 #, c-format msgid "C&onfiguration..." msgstr "&Ayarlamalar" -#: Merge.rc:181 -#: Merge.rc:296 -#: Merge.rc:478 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:481 #, c-format msgid "A&rchive Support disabled..." msgstr "&Yedekleme Desteði Kapalý" -#: Merge.rc:183 -#: Merge.rc:298 -#: Merge.rc:480 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:483 #, c-format msgid "&GNU Public License..." msgstr "&GNU Genel Lisansý." -#: Merge.rc:184 -#: Merge.rc:299 -#: Merge.rc:481 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:484 #, c-format msgid "&About WinMerge..." msgstr "&WinMerge Hakkýnda..." -#: Merge.rc:195 -#: Merge.rc:310 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" -#: Merge.rc:198 -#: Merge.rc:329 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "Salt Okunur S&ol" -#: Merge.rc:199 -#: Merge.rc:330 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "Salt Okunu&r Sað" -#: Merge.rc:201 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:207 -#: Merge.rc:355 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Tümünü Seç\tCtrl+A" -#: Merge.rc:213 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:220 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:233 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:237 -#: Merge.rc:414 +#: Merge.rc:238 +#: Merge.rc:416 #, c-format msgid "Refre&sh\tF5" msgstr "Ta&zele\tF5" -#: Merge.rc:238 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:240 -#: Merge.rc:416 +#: Merge.rc:241 +#: Merge.rc:418 #, c-format msgid "&Merge" msgstr "&Birleþtirme" -#: Merge.rc:242 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:244 -#: Merge.rc:418 +#: Merge.rc:245 +#: Merge.rc:420 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Sonraki Fark\tAlt+Down" -#: Merge.rc:245 -#: Merge.rc:419 +#: Merge.rc:246 +#: Merge.rc:421 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Önceki Fark\tAlt+Up" -#: Merge.rc:247 -#: Merge.rc:421 +#: Merge.rc:248 +#: Merge.rc:423 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Ýlk Fark\tAlt+Home" -#: Merge.rc:248 -#: Merge.rc:422 +#: Merge.rc:249 +#: Merge.rc:424 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Þu Anki Fark\tAlt+Enter" -#: Merge.rc:249 -#: Merge.rc:423 +#: Merge.rc:250 +#: Merge.rc:425 #, c-format msgid "&Last Difference\tAlt+End" msgstr "S&on Fark\tAlt+End" -#: Merge.rc:251 -#: Merge.rc:425 +#: Merge.rc:252 +#: Merge.rc:427 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "S&aða Kopyala\tAlt+Right" -#: Merge.rc:252 -#: Merge.rc:426 +#: Merge.rc:253 +#: Merge.rc:428 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "So&la Kopyala\tAlt+Left" -#: Merge.rc:254 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:258 -#: Merge.rc:549 +#: Merge.rc:259 +#: Merge.rc:552 #, c-format msgid "&Customize Columns..." msgstr "Kolonlarý &Özelleþtir" -#: Merge.rc:261 -#: Merge.rc:438 +#: Merge.rc:262 +#: Merge.rc:440 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:313 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "&Kaydet\tCtrl+S" -#: Merge.rc:314 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "S&olu Kaydet " -#: Merge.rc:316 -#: Merge.rc:321 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "&Kaydet" -#: Merge.rc:317 -#: Merge.rc:322 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "&Farklý Kaydet" -#: Merge.rc:319 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "&Saðý Kaydet" -#: Merge.rc:325 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:326 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:332 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&DOS (CRLF)" msgstr "" -#: Merge.rc:335 +#: Merge.rc:337 #, c-format msgid "&UNIX (LF)" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&MAC (CR)" msgstr "" -#: Merge.rc:339 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "Birleþtirme &Durumu\tF9" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:347 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Geri Al\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Geri Alý Geri Al\tCtrl+Y" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Kes\tCtrl+X" -#: Merge.rc:351 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&pyala\tCtrl+C" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Yapýþtýr\tCtrl+V" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:357 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Bul...\tCtrl+F" -#: Merge.rc:358 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Deðiþtir...\tCtrl+H" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "&Senaryolar(Scripts)" -#: Merge.rc:362 -#: Merge.rc:2870 +#: Merge.rc:364 +#: Merge.rc:2874 #, c-format msgid "< Empty >" msgstr "< Boþ >" -#: Merge.rc:365 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:370 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Git...\tCtrl+G" -#: Merge.rc:385 +#: Merge.rc:387 #, c-format msgid "Zoom In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:388 #, c-format msgid "Zoom Out\tCtrl+-" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:392 +#: Merge.rc:394 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "&View Whitespace" msgstr "&Boþluklarý Göster" -#: Merge.rc:394 +#: Merge.rc:396 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:395 +#: Merge.rc:397 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:396 +#: Merge.rc:398 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:397 +#: Merge.rc:399 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:409 +#: Merge.rc:411 #, c-format msgid "Diff &Pane" msgstr "Fark Penceresi" -#: Merge.rc:410 +#: Merge.rc:412 #, c-format msgid "Lo&cation Pane" msgstr "Pozisyon Penceresi" -#: Merge.rc:428 +#: Merge.rc:430 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "&Geliþmiþ Saða Kopyala\tAlt+Ctrl+Right" -#: Merge.rc:429 +#: Merge.rc:431 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "G&eliþmiþ Sola Kopyala\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:433 #, c-format msgid "Copy &All to Right" msgstr "&Tümünü Saða Kopyala" -#: Merge.rc:432 +#: Merge.rc:434 #, c-format msgid "Cop&y All to Left" msgstr "T&ümünü Sola Kopyala" -#: Merge.rc:447 +#: Merge.rc:449 #, c-format msgid "&Prediffer" msgstr "&Öncelikli Fark" -#: Merge.rc:489 +#: Merge.rc:492 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:490 +#: Merge.rc:493 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:492 +#: Merge.rc:495 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:497 +#: Merge.rc:500 #, c-format msgid "&Left to Right" msgstr "" -#: Merge.rc:498 +#: Merge.rc:501 #, c-format msgid "L&eft to..." msgstr "" -#: Merge.rc:499 +#: Merge.rc:502 #, c-format msgid "&Right to Left" msgstr "" -#: Merge.rc:500 +#: Merge.rc:503 #, c-format msgid "R&ight to..." msgstr "" -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "&Move" msgstr "" -#: Merge.rc:504 +#: Merge.rc:507 #, c-format msgid "&Left to..." msgstr "" -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&Right to..." msgstr "" -#: Merge.rc:507 +#: Merge.rc:510 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:509 -#: Merge.rc:1121 -#: Merge.rc:1500 +#: Merge.rc:512 +#: Merge.rc:1124 +#: Merge.rc:1503 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:510 -#: Merge.rc:1123 -#: Merge.rc:1503 +#: Merge.rc:513 +#: Merge.rc:1126 +#: Merge.rc:1506 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:522 +#: Merge.rc:525 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:529 +#: Merge.rc:532 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:531 +#: Merge.rc:534 #, c-format msgid "&Left (%1 of %2)" msgstr "" -#: Merge.rc:532 +#: Merge.rc:535 #, c-format msgid "&Right (%1 of %2)" msgstr "" -#: Merge.rc:533 +#: Merge.rc:536 #, c-format msgid "&Both (%1 of %2)" msgstr "" -#: Merge.rc:535 +#: Merge.rc:538 #, c-format msgid "Copy &Filenames" msgstr "" -#: Merge.rc:537 +#: Merge.rc:540 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:539 +#: Merge.rc:542 #, c-format msgid "&Left... (%1 of %2)" msgstr "" -#: Merge.rc:540 +#: Merge.rc:543 #, c-format msgid "&Right... (%1 of %2)" msgstr "" -#: Merge.rc:541 +#: Merge.rc:544 #, c-format msgid "&Both... (%1 of %2)" msgstr "" -#: Merge.rc:542 +#: Merge.rc:545 #, c-format msgid "&Differences... (%1 of %2)" msgstr "" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:557 +#: Merge.rc:560 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:558 +#: Merge.rc:561 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:564 +#: Merge.rc:567 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:566 +#: Merge.rc:569 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:567 +#: Merge.rc:570 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:575 +#: Merge.rc:578 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:579 +#: Merge.rc:582 #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:648 +#: Merge.rc:651 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:654 +#: Merge.rc:657 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:655 +#: Merge.rc:658 #, c-format msgid "All rights reserved." msgstr "" -#: Merge.rc:656 +#: Merge.rc:659 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:659 -#: Merge.rc:690 -#: Merge.rc:780 -#: Merge.rc:966 -#: Merge.rc:1040 -#: Merge.rc:1069 -#: Merge.rc:1079 -#: Merge.rc:1242 -#: Merge.rc:1306 -#: Merge.rc:1319 -#: Merge.rc:1411 -#: Merge.rc:1426 +#: Merge.rc:662 +#: Merge.rc:693 +#: Merge.rc:783 +#: Merge.rc:969 +#: Merge.rc:1043 +#: Merge.rc:1072 +#: Merge.rc:1082 +#: Merge.rc:1245 +#: Merge.rc:1309 +#: Merge.rc:1322 +#: Merge.rc:1414 +#: Merge.rc:1429 #, c-format msgid "OK" msgstr "" -#: Merge.rc:660 +#: Merge.rc:663 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:666 +#: Merge.rc:669 #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:669 -#: Merge.rc:1577 +#: Merge.rc:672 +#: Merge.rc:1580 #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:673 -#: Merge.rc:734 -#: Merge.rc:990 -#: Merge.rc:1005 +#: Merge.rc:676 +#: Merge.rc:737 +#: Merge.rc:993 +#: Merge.rc:1008 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:674 -#: Merge.rc:1581 +#: Merge.rc:677 +#: Merge.rc:1584 #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:678 -#: Merge.rc:1016 +#: Merge.rc:681 +#: Merge.rc:1019 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:679 -#: Merge.rc:1585 +#: Merge.rc:682 +#: Merge.rc:1588 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:682 -#: Merge.rc:1587 +#: Merge.rc:685 +#: Merge.rc:1590 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:683 +#: Merge.rc:686 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:686 +#: Merge.rc:689 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:687 -#: Merge.rc:1588 +#: Merge.rc:690 +#: Merge.rc:1591 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:689 +#: Merge.rc:692 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:721 -#: Merge.rc:781 -#: Merge.rc:811 -#: Merge.rc:843 -#: Merge.rc:853 -#: Merge.rc:1041 -#: Merge.rc:1070 -#: Merge.rc:1080 -#: Merge.rc:1131 -#: Merge.rc:1243 -#: Merge.rc:1320 -#: Merge.rc:1412 -#: Merge.rc:1427 +#: Merge.rc:694 +#: Merge.rc:724 +#: Merge.rc:784 +#: Merge.rc:814 +#: Merge.rc:846 +#: Merge.rc:856 +#: Merge.rc:1044 +#: Merge.rc:1073 +#: Merge.rc:1083 +#: Merge.rc:1134 +#: Merge.rc:1246 +#: Merge.rc:1323 +#: Merge.rc:1415 +#: Merge.rc:1430 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:692 -#: Merge.rc:1321 +#: Merge.rc:695 +#: Merge.rc:1324 #, c-format msgid "Help" msgstr "" -#: Merge.rc:693 +#: Merge.rc:696 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:700 +#: Merge.rc:703 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:708 +#: Merge.rc:711 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:714 #, c-format msgid "User:" msgstr "" -#: Merge.rc:713 +#: Merge.rc:716 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:715 +#: Merge.rc:718 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:717 -#: Merge.rc:858 +#: Merge.rc:720 +#: Merge.rc:861 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:719 +#: Merge.rc:722 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:720 -#: Merge.rc:854 +#: Merge.rc:723 +#: Merge.rc:857 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:726 +#: Merge.rc:729 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:732 +#: Merge.rc:735 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:739 -#: Merge.rc:1892 +#: Merge.rc:742 +#: Merge.rc:1895 #, c-format msgid "General" msgstr "" -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Disable Splash Screen" msgstr "" -#: Merge.rc:747 +#: Merge.rc:750 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:749 +#: Merge.rc:752 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:752 +#: Merge.rc:755 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:754 +#: Merge.rc:757 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:756 +#: Merge.rc:759 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:759 +#: Merge.rc:762 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:762 +#: Merge.rc:765 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:764 -#: Merge.rc:1600 +#: Merge.rc:767 +#: Merge.rc:1603 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:766 -#: Merge.rc:1602 +#: Merge.rc:769 +#: Merge.rc:1605 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "Language" msgstr "" -#: Merge.rc:784 +#: Merge.rc:787 #, c-format msgid "Available languages:" msgstr "" -#: Merge.rc:790 +#: Merge.rc:793 #, c-format msgid "Find" msgstr "" -#: Merge.rc:793 -#: Merge.rc:820 +#: Merge.rc:796 +#: Merge.rc:823 #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:796 -#: Merge.rc:826 +#: Merge.rc:799 +#: Merge.rc:829 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:798 -#: Merge.rc:828 +#: Merge.rc:801 +#: Merge.rc:831 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:800 -#: Merge.rc:830 +#: Merge.rc:803 +#: Merge.rc:833 #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:805 +#: Merge.rc:808 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:806 +#: Merge.rc:809 #, c-format msgid "&Up" msgstr "" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "&Down" msgstr "" -#: Merge.rc:810 -#: Merge.rc:840 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:817 +#: Merge.rc:820 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:832 +#: Merge.rc:835 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:836 +#: Merge.rc:839 #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:838 +#: Merge.rc:841 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:842 +#: Merge.rc:845 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:849 -#: Merge.rc:2120 +#: Merge.rc:852 +#: Merge.rc:2123 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:852 +#: Merge.rc:855 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:857 -#: Merge.rc:1162 +#: Merge.rc:860 +#: Merge.rc:1165 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:866 +#: Merge.rc:869 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:869 +#: Merge.rc:872 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:875 #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:879 +#: Merge.rc:882 #, c-format msgid "Save" msgstr "" -#: Merge.rc:880 +#: Merge.rc:883 #, c-format msgid "New" msgstr "" -#: Merge.rc:881 +#: Merge.rc:884 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:882 +#: Merge.rc:885 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:887 -#: Merge.rc:1895 +#: Merge.rc:890 +#: Merge.rc:1898 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:894 +#: Merge.rc:897 #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:898 -#: Merge.rc:1552 +#: Merge.rc:901 +#: Merge.rc:1555 #, c-format msgid "Background" msgstr "" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:912 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:915 +#: Merge.rc:1350 +#: Merge.rc:1556 #, c-format msgid "Text" msgstr "" -#: Merge.rc:916 +#: Merge.rc:919 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:926 +#: Merge.rc:929 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:936 +#: Merge.rc:939 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:943 +#: Merge.rc:946 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:950 +#: Merge.rc:953 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:957 -#: Merge.rc:1039 -#: Merge.rc:1068 -#: Merge.rc:1165 -#: Merge.rc:1393 +#: Merge.rc:960 +#: Merge.rc:1042 +#: Merge.rc:1071 +#: Merge.rc:1168 +#: Merge.rc:1396 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:963 -#: Merge.rc:1335 -#: Merge.rc:1541 +#: Merge.rc:966 +#: Merge.rc:1338 +#: Merge.rc:1544 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:973 -#: Merge.rc:1898 +#: Merge.rc:976 +#: Merge.rc:1901 #, c-format msgid "System" msgstr "" -#: Merge.rc:976 +#: Merge.rc:979 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:978 +#: Merge.rc:981 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:981 +#: Merge.rc:984 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:985 #, c-format msgid "&Add to explorer context menu" msgstr "" -#: Merge.rc:984 +#: Merge.rc:987 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:986 +#: Merge.rc:989 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:991 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:991 +#: Merge.rc:994 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 -#: Merge.rc:1405 -#: Merge.rc:1579 -#: Merge.rc:1583 -#: Merge.rc:1610 +#: Merge.rc:996 +#: Merge.rc:1408 +#: Merge.rc:1582 +#: Merge.rc:1586 +#: Merge.rc:1613 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1006 +#: Merge.rc:1009 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1009 +#: Merge.rc:1012 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:1010 +#: Merge.rc:1013 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1011 +#: Merge.rc:1014 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1013 +#: Merge.rc:1016 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1018 +#: Merge.rc:1021 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1027 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1027 +#: Merge.rc:1030 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:1029 +#: Merge.rc:1032 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1034 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:1035 +#: Merge.rc:1038 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1037 +#: Merge.rc:1040 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1059 +#: Merge.rc:1062 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1065 +#: Merge.rc:1068 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1069 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1076 +#: Merge.rc:1079 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1084 +#: Merge.rc:1087 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1087 +#: Merge.rc:1090 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1088 +#: Merge.rc:1091 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1102 -#: Merge.rc:1845 +#: Merge.rc:1105 +#: Merge.rc:1848 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1107 +#: Merge.rc:1110 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1108 +#: Merge.rc:1111 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1109 +#: Merge.rc:1112 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1118 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1118 +#: Merge.rc:1121 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1120 +#: Merge.rc:1123 #, c-format msgid "File" msgstr "" -#: Merge.rc:1125 +#: Merge.rc:1128 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1126 +#: Merge.rc:1129 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1128 +#: Merge.rc:1131 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1136 -#: Merge.rc:1893 +#: Merge.rc:1139 +#: Merge.rc:1896 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1139 +#: Merge.rc:1142 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1142 +#: Merge.rc:1145 #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1144 +#: Merge.rc:1147 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1146 +#: Merge.rc:1149 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1148 +#: Merge.rc:1151 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1150 +#: Merge.rc:1153 #, c-format msgid "Igno&re carriage return differences (DOS/UNIX/MAC)" msgstr "" -#: Merge.rc:1153 +#: Merge.rc:1156 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&File Compare method:" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1163 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1170 -#: Merge.rc:1894 +#: Merge.rc:1173 +#: Merge.rc:1897 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1176 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1177 +#: Merge.rc:1180 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1179 +#: Merge.rc:1182 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1180 +#: Merge.rc:1183 #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1186 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1185 +#: Merge.rc:1188 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1187 +#: Merge.rc:1190 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1192 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1211 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1214 +#: Merge.rc:1217 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1215 +#: Merge.rc:1218 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1216 +#: Merge.rc:1219 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1217 +#: Merge.rc:1220 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1218 +#: Merge.rc:1221 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1227 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1227 +#: Merge.rc:1230 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1230 +#: Merge.rc:1233 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1232 +#: Merge.rc:1235 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1237 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1237 +#: Merge.rc:1240 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1239 +#: Merge.rc:1242 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1241 +#: Merge.rc:1244 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1248 -#: Merge.rc:1496 -#: Merge.rc:1900 +#: Merge.rc:1251 +#: Merge.rc:1499 +#: Merge.rc:1903 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1251 +#: Merge.rc:1254 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1252 +#: Merge.rc:1255 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1254 +#: Merge.rc:1257 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" "need to restart session" msgstr "" -#: Merge.rc:1257 +#: Merge.rc:1260 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1259 +#: Merge.rc:1262 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1261 +#: Merge.rc:1264 #, c-format msgid "Custom codepage :" msgstr "" -#: Merge.rc:1269 +#: Merge.rc:1272 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1272 +#: Merge.rc:1275 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1275 +#: Merge.rc:1278 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1277 +#: Merge.rc:1280 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1279 +#: Merge.rc:1282 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1281 +#: Merge.rc:1284 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1283 +#: Merge.rc:1286 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1288 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1288 #: Merge.rc:1291 +#: Merge.rc:1294 #, c-format msgid "present" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1292 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1292 +#: Merge.rc:1295 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1294 -#: Merge.rc:1299 +#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "none" msgstr "" -#: Merge.rc:1296 +#: Merge.rc:1299 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1300 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1304 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1305 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1303 +#: Merge.rc:1306 #, c-format msgid "" "Don't display this &message again.\n" "(You can always recall this message from help menu.)" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1310 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1316 +#: Merge.rc:1319 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1327 +#: Merge.rc:1330 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1329 +#: Merge.rc:1332 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1330 +#: Merge.rc:1333 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1338 +#: Merge.rc:1341 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1342 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1343 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1341 +#: Merge.rc:1344 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1342 +#: Merge.rc:1345 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1343 +#: Merge.rc:1346 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1344 +#: Merge.rc:1347 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1345 +#: Merge.rc:1348 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1346 +#: Merge.rc:1349 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1351 -#: Merge.rc:1356 -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 +#: Merge.rc:1354 +#: Merge.rc:1359 +#: Merge.rc:1364 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1399 +#: Merge.rc:1402 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1402 +#: Merge.rc:1405 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1406 +#: Merge.rc:1409 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1412 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1417 +#: Merge.rc:1420 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1420 +#: Merge.rc:1423 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1422 +#: Merge.rc:1425 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1424 +#: Merge.rc:1427 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1432 -#: Merge.rc:1901 +#: Merge.rc:1435 +#: Merge.rc:1904 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1435 +#: Merge.rc:1438 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1437 +#: Merge.rc:1440 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1438 +#: Merge.rc:1441 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1443 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1443 +#: Merge.rc:1446 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1448 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1456 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1456 +#: Merge.rc:1459 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1460 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1458 -#: Merge.rc:2268 +#: Merge.rc:1461 +#: Merge.rc:2271 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1459 +#: Merge.rc:1462 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1462 -#: Merge.rc:1481 +#: Merge.rc:1465 +#: Merge.rc:1484 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1465 +#: Merge.rc:1468 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1469 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1471 +#: Merge.rc:1474 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1476 -#: Merge.rc:2263 +#: Merge.rc:1479 +#: Merge.rc:2266 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1485 +#: Merge.rc:1488 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1490 +#: Merge.rc:1493 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1499 +#: Merge.rc:1502 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1502 #: Merge.rc:1505 +#: Merge.rc:1508 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1509 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1507 +#: Merge.rc:1510 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1509 #: Merge.rc:1512 +#: Merge.rc:1515 #, c-format msgid "..." msgstr "" -#: Merge.rc:1510 +#: Merge.rc:1513 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1513 +#: Merge.rc:1516 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1519 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1517 -#: Merge.rc:1867 +#: Merge.rc:1520 +#: Merge.rc:1870 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1522 +#: Merge.rc:1525 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1538 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1544 +#: Merge.rc:1547 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1550 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1549 +#: Merge.rc:1552 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1550 +#: Merge.rc:1553 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1551 +#: Merge.rc:1554 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1574 +#: Merge.rc:1577 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1580 +#: Merge.rc:1583 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1587 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1593 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1591 +#: Merge.rc:1594 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1596 -#: Merge.rc:1902 +#: Merge.rc:1599 +#: Merge.rc:1905 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1599 +#: Merge.rc:1602 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1604 +#: Merge.rc:1607 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1608 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1610 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1611 +#: Merge.rc:1614 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1612 +#: Merge.rc:1615 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1617 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1624 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1625 +#: Merge.rc:1628 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1630 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1633 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1633 +#: Merge.rc:1636 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1634 +#: Merge.rc:1637 #, c-format msgid "No" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1659 +#: Merge.rc:1662 #, c-format msgid "040904e4" msgstr "041f04e6" #. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file! -#: Merge.rc:1661 +#: Merge.rc:1664 #, c-format msgid "English translation by developers" msgstr "Translated by Ozkan UNVER" #. VarFileInfo.Translation -#: Merge.rc:1674 +#: Merge.rc:1677 #, c-format msgid "0x409, 1252" msgstr "0x41f, 1254" -#: Merge.rc:1689 +#: Merge.rc:1692 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1695 +#: Merge.rc:1698 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1696 +#: Merge.rc:1699 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1700 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1698 +#: Merge.rc:1701 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1699 +#: Merge.rc:1702 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1703 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1709 #, c-format msgid "" "Create empty documents\n" "New Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1710 #, c-format msgid "" "Open an existing document\n" "Open (Ctrl+O)" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1711 #, c-format msgid "" "Close the active document\n" "Close" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1712 #, c-format msgid "" "Save the active document\n" "Save (Ctrl+S)" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1713 #, c-format msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1714 #, c-format msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#: Merge.rc:1712 +#: Merge.rc:1715 #, c-format msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#: Merge.rc:1713 +#: Merge.rc:1716 #, c-format msgid "" "Print the active document\n" "Print" msgstr "" -#: Merge.rc:1714 +#: Merge.rc:1717 #, c-format msgid "" "Display full pages\n" "Print Preview" msgstr "" -#: Merge.rc:1719 +#: Merge.rc:1722 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1728 #, c-format msgid "" "Open project file\n" "Project file (Ctrl+J)" msgstr "" -#: Merge.rc:1726 +#: Merge.rc:1729 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1727 +#: Merge.rc:1730 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1728 +#: Merge.rc:1731 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1729 +#: Merge.rc:1732 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1733 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1731 +#: Merge.rc:1734 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1739 #, c-format msgid "" "Display program information, version number and copyright\n" "About" msgstr "" -#: Merge.rc:1737 +#: Merge.rc:1740 #, c-format msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "" -#: Merge.rc:1743 -#: Merge.rc:1744 -#: Merge.rc:1745 #: Merge.rc:1746 #: Merge.rc:1747 #: Merge.rc:1748 @@ -2729,227 +2733,230 @@ msgstr "" #: Merge.rc:1756 #: Merge.rc:1757 #: Merge.rc:1758 +#: Merge.rc:1759 +#: Merge.rc:1760 +#: Merge.rc:1761 #, c-format msgid "Open this document" msgstr "" -#: Merge.rc:1763 +#: Merge.rc:1766 #, c-format msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "" -#: Merge.rc:1764 +#: Merge.rc:1767 #, c-format msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "" -#: Merge.rc:1770 +#: Merge.rc:1773 #, c-format msgid "" "Open another window for the active document\n" "New Window" msgstr "" -#: Merge.rc:1771 +#: Merge.rc:1774 #, c-format msgid "" "Arrange icons at the bottom of the window\n" "Arrange Icons" msgstr "" -#: Merge.rc:1772 +#: Merge.rc:1775 #, c-format msgid "" "Arrange windows so they overlap\n" "Cascade Windows" msgstr "" -#: Merge.rc:1773 +#: Merge.rc:1776 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" "Tile Windows Horizontally" msgstr "" -#: Merge.rc:1774 +#: Merge.rc:1777 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" "Tile Windows Vertically" msgstr "" -#: Merge.rc:1775 +#: Merge.rc:1778 #, c-format msgid "" "Split the active window into panes\n" "Split" msgstr "" -#: Merge.rc:1781 +#: Merge.rc:1784 #, c-format msgid "" "Erase the selection\n" "Erase" msgstr "" -#: Merge.rc:1782 +#: Merge.rc:1785 #, c-format msgid "" "Erase everything\n" "Erase All" msgstr "" -#: Merge.rc:1783 +#: Merge.rc:1786 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "" -#: Merge.rc:1784 +#: Merge.rc:1787 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" msgstr "" -#: Merge.rc:1785 +#: Merge.rc:1788 #, c-format msgid "" "Find the specified text\n" "Find" msgstr "" -#: Merge.rc:1786 +#: Merge.rc:1789 #, c-format msgid "" "Insert Clipboard contents\n" "Paste" msgstr "" -#: Merge.rc:1787 +#: Merge.rc:1790 #, c-format msgid "" "Repeat the last action\n" "Repeat" msgstr "" -#: Merge.rc:1788 +#: Merge.rc:1791 #, c-format msgid "" "Replace specific text with different text\n" "Replace" msgstr "" -#: Merge.rc:1789 +#: Merge.rc:1792 #, c-format msgid "" "Select the entire document\n" "Select All" msgstr "" -#: Merge.rc:1790 +#: Merge.rc:1793 #, c-format msgid "" "Undo the last action\n" "Undo (Ctrl+Z)" msgstr "" -#: Merge.rc:1791 +#: Merge.rc:1794 #, c-format msgid "" "Redo the previously undone action\n" "Redo (Ctrl+Y)" msgstr "" -#: Merge.rc:1797 +#: Merge.rc:1800 #, c-format msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "" -#: Merge.rc:1798 +#: Merge.rc:1801 #, c-format msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "" -#: Merge.rc:1799 +#: Merge.rc:1802 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1800 +#: Merge.rc:1803 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1809 #, c-format msgid "Change the window size" msgstr "" -#: Merge.rc:1807 +#: Merge.rc:1810 #, c-format msgid "Change the window position" msgstr "" -#: Merge.rc:1808 +#: Merge.rc:1811 #, c-format msgid "Reduce the window to an icon" msgstr "" -#: Merge.rc:1809 +#: Merge.rc:1812 #, c-format msgid "Enlarge the window to full size" msgstr "" -#: Merge.rc:1810 +#: Merge.rc:1813 #, c-format msgid "Switch to the next document window" msgstr "" -#: Merge.rc:1811 +#: Merge.rc:1814 #, c-format msgid "Switch to the previous document window" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1815 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "" -#: Merge.rc:1817 +#: Merge.rc:1820 #, c-format msgid "Restore the window to normal size" msgstr "" -#: Merge.rc:1818 +#: Merge.rc:1821 #, c-format msgid "Activate Task List" msgstr "" -#: Merge.rc:1819 +#: Merge.rc:1822 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:1825 +#: Merge.rc:1828 #, c-format msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#: Merge.rc:1832 +#: Merge.rc:1835 #, c-format msgid "" "\n" @@ -2961,175 +2968,175 @@ msgid "" "WinMerge Document" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1842 #, c-format msgid "Preserve original EOL chars" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1849 #, c-format msgid "Press any key" msgstr "" -#: Merge.rc:1852 -#: Merge.rc:1853 +#: Merge.rc:1855 +#: Merge.rc:1856 #, c-format msgid "Right click on the path to copy" msgstr "" -#: Merge.rc:1859 +#: Merge.rc:1862 #, c-format msgid "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford" msgstr "" -#: Merge.rc:1860 +#: Merge.rc:1863 #, 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 Public License in the Help menu for details." msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1869 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1868 +#: Merge.rc:1871 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:1869 +#: Merge.rc:1872 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:1870 +#: Merge.rc:1873 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:1871 +#: Merge.rc:1874 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:1872 +#: Merge.rc:1875 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1881 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1882 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1883 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:1881 +#: Merge.rc:1884 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:1882 +#: Merge.rc:1885 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:1883 +#: Merge.rc:1886 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:1885 +#: Merge.rc:1888 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:1886 +#: Merge.rc:1889 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:1896 +#: Merge.rc:1899 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1897 +#: Merge.rc:1900 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1899 +#: Merge.rc:1902 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1909 +#: Merge.rc:1912 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1913 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1911 +#: Merge.rc:1914 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1915 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1916 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1922 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1923 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1929 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:1930 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:1928 +#: Merge.rc:1931 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "" -#: Merge.rc:1929 +#: Merge.rc:1932 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "" -#: Merge.rc:1931 +#: Merge.rc:1934 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3137,7 +3144,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1936 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3145,107 +3152,107 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1942 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1943 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1941 +#: Merge.rc:1944 #, c-format msgid "All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1942 +#: Merge.rc:1945 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1944 +#: Merge.rc:1947 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1950 +#: Merge.rc:1953 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1954 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1952 +#: Merge.rc:1955 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1961 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1962 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1960 +#: Merge.rc:1963 #, c-format msgid "Modified Date" msgstr "" -#: Merge.rc:1961 +#: Merge.rc:1964 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1962 +#: Merge.rc:1965 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "Name" msgstr "" -#: Merge.rc:1969 +#: Merge.rc:1972 #, c-format msgid "Location" msgstr "" -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1971 +#: Merge.rc:1974 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1973 +#: Merge.rc:1976 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1977 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1979 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3254,7 +3261,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3263,7 +3270,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3271,7 +3278,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1982 +#: Merge.rc:1985 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3280,12 +3287,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:1988 #, c-format msgid "" "Installing filter file failed.\n" @@ -3293,208 +3300,208 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:1987 +#: Merge.rc:1990 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:1996 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "&Path to cleartool.exe :" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "&Path to SS.EXE :" msgstr "" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Folder Comparison Results" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "File Comparison" msgstr "" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2011 +#: Merge.rc:2014 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Scanning files..." msgstr "" -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Opening selection" msgstr "" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "Copying Left to Right" msgstr "" -#: Merge.rc:2020 +#: Merge.rc:2023 #, c-format msgid "Copying Right to Left" msgstr "" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Copying All to Left" msgstr "" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "Copying All to Right" msgstr "" -#: Merge.rc:2023 +#: Merge.rc:2026 #, c-format msgid "Copying files..." msgstr "" -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "Deleting files..." msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2028 #, c-format msgid "Moving files..." msgstr "" -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2032 +#: Merge.rc:2035 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2037 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2039 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2037 +#: Merge.rc:2040 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2038 +#: Merge.rc:2041 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2039 +#: Merge.rc:2042 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2048 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2046 +#: Merge.rc:2049 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2055 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2055 +#: Merge.rc:2058 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2056 +#: Merge.rc:2059 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2057 +#: Merge.rc:2060 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2058 +#: Merge.rc:2061 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2062 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2069 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2067 +#: Merge.rc:2070 #, c-format msgid "" "%1\n" @@ -3503,7 +3510,7 @@ msgid "" "are identical binary files." msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2071 #, c-format msgid "" "%1\n" @@ -3512,7 +3519,7 @@ msgid "" "are different binary files." msgstr "" -#: Merge.rc:2069 +#: Merge.rc:2072 #, c-format msgid "" "%1\n" @@ -3520,7 +3527,7 @@ msgid "" "is binary file. Cannot compare binary and text files." msgstr "" -#: Merge.rc:2070 +#: Merge.rc:2073 #, c-format msgid "" "Cannot open file\n" @@ -3529,37 +3536,37 @@ msgid "" "%2" msgstr "" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2079 +#: Merge.rc:2082 #, 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:2080 +#: Merge.rc:2083 #, c-format msgid "Error checking destination writeability" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2083 +#: Merge.rc:2086 #, c-format msgid "" "Unable to backup original file:\n" @@ -3568,7 +3575,7 @@ msgid "" "Continue anyway?" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2087 #, c-format msgid "" "Saving file failed.\n" @@ -3579,7 +3586,7 @@ msgid "" "\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2088 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3589,7 +3596,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2086 +#: Merge.rc:2089 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3599,7 +3606,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2087 +#: Merge.rc:2090 #, c-format msgid "" "Another application has updated file\n" @@ -3609,14 +3616,14 @@ msgid "" "Overwrite changed file?" msgstr "" -#: Merge.rc:2088 +#: Merge.rc:2091 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2089 +#: Merge.rc:2092 #, c-format msgid "" "Another application has updated file\n" @@ -3626,17 +3633,17 @@ msgid "" "If you want to refresh files close current file compare and load files again." msgstr "" -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2097 +#: Merge.rc:2100 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3644,42 +3651,42 @@ msgid "" "Refresh documents before continuing." msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2106 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2104 +#: Merge.rc:2107 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2108 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2106 +#: Merge.rc:2109 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2107 +#: Merge.rc:2110 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3687,186 +3694,186 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2114 #, 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:2117 -#: Merge.rc:2906 +#: Merge.rc:2120 +#: Merge.rc:2910 #, c-format msgid "None" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2121 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2122 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2128 -#: Merge.rc:2130 +#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2129 -#: Merge.rc:2131 +#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Delete selected item on left" msgstr "" -#: Merge.rc:2133 +#: Merge.rc:2136 #, c-format msgid "Delete selected item on right" msgstr "" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Delete selected item(s) on both sides" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2139 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2139 +#: Merge.rc:2142 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2140 +#: Merge.rc:2143 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2141 -#: Merge.rc:2157 +#: Merge.rc:2144 +#: Merge.rc:2160 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2142 -#: Merge.rc:2158 +#: Merge.rc:2145 +#: Merge.rc:2161 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2143 -#: Merge.rc:2159 +#: Merge.rc:2146 +#: Merge.rc:2162 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2144 -#: Merge.rc:2160 +#: Merge.rc:2147 +#: Merge.rc:2163 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2153 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2154 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2152 +#: Merge.rc:2155 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:2156 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2154 +#: Merge.rc:2157 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2155 +#: Merge.rc:2158 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2156 +#: Merge.rc:2159 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2161 +#: Merge.rc:2164 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2162 +#: Merge.rc:2165 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2163 +#: Merge.rc:2166 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2167 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2173 #, c-format msgid "Are you sure you want to copy all differences to the left file?" msgstr "" -#: Merge.rc:2171 +#: Merge.rc:2174 #, c-format msgid "Are you sure you want to copy all differences to the right file?" msgstr "" -#: Merge.rc:2172 +#: Merge.rc:2175 #, c-format msgid "" "Are you sure you want to copy\n" @@ -3876,17 +3883,17 @@ msgid "" "%2 ?" msgstr "" -#: Merge.rc:2173 +#: Merge.rc:2176 #, c-format msgid "Are you sure you want to copy %1 of %2 selected item(s)?" msgstr "" -#: Merge.rc:2174 +#: Merge.rc:2177 #, c-format msgid "Are you sure you want to delete %1 of %2 selected item(s)?" msgstr "" -#: Merge.rc:2175 +#: Merge.rc:2178 #, c-format msgid "" "Delete directory\n" @@ -3894,7 +3901,7 @@ msgid "" "%1 ?" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2179 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3902,17 +3909,17 @@ msgid "" "%1 ?" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2180 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2181 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2182 #, c-format msgid "" "Operation aborted!\n" @@ -3924,505 +3931,505 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2188 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2189 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2190 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2188 +#: Merge.rc:2191 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:2192 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2190 +#: Merge.rc:2193 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2191 +#: Merge.rc:2194 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2192 +#: Merge.rc:2195 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2196 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2194 +#: Merge.rc:2197 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:2198 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2199 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2205 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2206 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2207 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2208 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2209 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2208 +#: Merge.rc:2211 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2210 +#: Merge.rc:2213 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2216 +#: Merge.rc:2219 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2217 +#: Merge.rc:2220 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2221 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2219 +#: Merge.rc:2222 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2220 +#: Merge.rc:2223 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2221 +#: Merge.rc:2224 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2222 +#: Merge.rc:2225 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2226 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2227 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2228 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2234 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2235 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2236 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2234 +#: Merge.rc:2237 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2235 +#: Merge.rc:2238 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2239 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2237 +#: Merge.rc:2240 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2241 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2242 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2243 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2249 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2247 +#: Merge.rc:2250 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2251 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2249 +#: Merge.rc:2252 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2250 -#: Merge.rc:2729 +#: Merge.rc:2253 +#: Merge.rc:2732 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2259 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2260 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2261 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2262 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2263 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2264 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2265 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2267 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2265 +#: Merge.rc:2268 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2269 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2270 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2272 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2278 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2276 +#: Merge.rc:2279 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2280 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2286 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2284 +#: Merge.rc:2287 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2285 +#: Merge.rc:2288 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2286 +#: Merge.rc:2289 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2287 +#: Merge.rc:2290 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2288 +#: Merge.rc:2291 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2292 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2290 +#: Merge.rc:2293 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2294 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2295 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2301 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2302 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2303 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2301 +#: Merge.rc:2304 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2302 +#: Merge.rc:2305 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2303 +#: Merge.rc:2306 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2304 +#: Merge.rc:2307 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2305 +#: Merge.rc:2308 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2309 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2310 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2316 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2314 +#: Merge.rc:2317 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2318 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2319 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2320 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2326 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2327 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2328 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2329 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2330 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2332 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2333 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2334 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2340 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2341 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2342 #, c-format msgid "The selected folder exists only in other side and therefore cannot be opened." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2343 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2341 +#: Merge.rc:2344 #, c-format msgid "Binary files cannot be visually compared." msgstr "" -#: Merge.rc:2342 +#: Merge.rc:2345 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2343 +#: Merge.rc:2346 #, c-format msgid "Directory files cannot be visually compared." msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2347 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4432,7 +4439,7 @@ msgid "" "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2348 #, c-format msgid "" "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n" @@ -4440,22 +4447,22 @@ msgid "" " Do you want to change the options and preserve the different EOL ?" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2349 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2350 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2351 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2357 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4463,132 +4470,132 @@ msgid "" "Would you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2358 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2359 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2360 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2361 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2367 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2368 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2374 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2375 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2378 +#: Merge.rc:2381 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2382 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2388 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2389 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2395 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2393 +#: Merge.rc:2396 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2394 +#: Merge.rc:2397 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2398 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2399 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2397 +#: Merge.rc:2400 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2401 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2402 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2403 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2401 +#: Merge.rc:2404 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2405 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2406 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2407 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2408 #, c-format msgid "" "Please save all files first.\n" @@ -4596,17 +4603,17 @@ msgid "" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2409 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2414 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2415 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4614,51 +4621,51 @@ msgid "" "See manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2413 +#: Merge.rc:2416 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2417 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2418 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2419 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2420 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2421 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2422 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2423 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2424 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4666,1744 +4673,1749 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2430 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2431 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2429 +#: Merge.rc:2432 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2433 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2434 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2435 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2436 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2437 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2438 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2439 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2440 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2441 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2442 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2443 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2444 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2445 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2450 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2456 #, c-format msgid "Afrikaans" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2457 #, c-format msgid "Albanian" msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2458 #, c-format msgid "Arabic (Saudi Arabian)" msgstr "" -#: Merge.rc:2456 +#: Merge.rc:2459 #, c-format msgid "Arabic (Iraq)" msgstr "" -#: Merge.rc:2457 +#: Merge.rc:2460 #, c-format msgid "Arabic (Egyptian)" msgstr "" -#: Merge.rc:2458 +#: Merge.rc:2461 #, c-format msgid "Arabic (Libyan)" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2462 #, c-format msgid "Arabic (Algerian)" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2463 #, c-format msgid "Arabic (Moroccan)" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2464 #, c-format msgid "Arabic (Tunisian)" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2465 #, c-format msgid "Arabic (Oman)" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2466 #, c-format msgid "Arabic (Yemen)" msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2467 #, c-format msgid "Arabic (Syrian)" msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2468 #, c-format msgid "Arabic (Jordan)" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2474 #, c-format msgid "Arabic (Lebanon)" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2475 #, c-format msgid "Arabic (Kuwait)" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2476 #, c-format msgid "Arabic (UAE)" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2477 #, c-format msgid "Arabic (Bahrain)" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2478 #, c-format msgid "Arabic (Qatar)" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2479 #, c-format msgid "Armenian" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2480 #, c-format msgid "Azeri (Latin)" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2481 #, c-format msgid "Azeri (Cyrillic)" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2482 #, c-format msgid "Basque" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2483 #, c-format msgid "Belarusian" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2484 #, c-format msgid "Bulgarian" msgstr "" -#: Merge.rc:2482 +#: Merge.rc:2485 #, c-format msgid "Catalan" msgstr "" -#: Merge.rc:2483 +#: Merge.rc:2486 #, c-format msgid "Chinese (Traditional)" msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2487 #, c-format msgid "Chinese (Simplified)" msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2488 #, c-format msgid "Chinese (Hong Kong)" msgstr "" -#: Merge.rc:2486 +#: Merge.rc:2489 #, c-format msgid "Chinese (Singapore)" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2495 #, c-format msgid "Chinese (Macau SAR)" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2496 #, c-format msgid "Croatian" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2497 #, c-format msgid "Czech" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2498 #, c-format msgid "Dansk" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2499 #, c-format msgid "Dutch" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2500 #, c-format msgid "Dutch (Belgium)" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2501 #, c-format msgid "English (US)" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2502 #, c-format msgid "English (UK)" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2503 #, c-format msgid "English (Australian)" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2504 #, c-format msgid "English (Canadian)" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2505 #, c-format msgid "English (New Zealand)" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2506 #, c-format msgid "English (Irish)" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2507 #, c-format msgid "English (So. African)" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2508 #, c-format msgid "English (Jamaican)" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2509 #, c-format msgid "English (Caribbean)" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2510 #, c-format msgid "English (Belize)" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2516 #, c-format msgid "English (Trinidad)" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2517 #, c-format msgid "English (Zimbabwe)" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2518 #, c-format msgid "English (Philippines)" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2519 #, c-format msgid "Eesti" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2520 #, c-format msgid "Faeroese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2521 #, c-format msgid "Farsi" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2522 #, c-format msgid "Suomi" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2523 #, c-format msgid "French" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2524 #, c-format msgid "French (Belgique)" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2525 #, c-format msgid "French (Canada)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2526 #, c-format msgid "French (Switzerland)" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2527 #, c-format msgid "French (Luxembourg)" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2528 #, c-format msgid "French (Monaco)" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2529 #, c-format msgid "Georgian" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2530 #, c-format msgid "German (Germany)" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2531 #, c-format msgid "German (Switzerland)" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2537 #, c-format msgid "German (Austria)" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2538 #, c-format msgid "German (Luxembourg)" msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2539 #, c-format msgid "German (Liechtenstein)" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2540 #, c-format msgid "Greek" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2541 #, c-format msgid "Hebrew" msgstr "" -#: Merge.rc:2539 +#: Merge.rc:2542 #, c-format msgid "Hindi" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2543 #, c-format msgid "Hungarian" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2544 #, c-format msgid "Icelandic" msgstr "" -#: Merge.rc:2542 +#: Merge.rc:2545 #, c-format msgid "Indonesian" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2546 #, c-format msgid "Italian" msgstr "" -#: Merge.rc:2544 +#: Merge.rc:2547 #, c-format msgid "Italian (Swiss)" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2548 #, c-format msgid "Japanese" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2549 #, c-format msgid "Kashmiri (India)" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2550 #, c-format msgid "Kazakh" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2551 #, c-format msgid "Korean" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2552 #, c-format msgid "Korean (Johab)" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:2558 #, c-format msgid "Latvian" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2559 #, c-format msgid "Lithuanian" msgstr "" -#: Merge.rc:2557 +#: Merge.rc:2560 #, c-format msgid "Malay (Malaysian)" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2561 #, c-format msgid "Malay (Brunei Darussalam)" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2562 #, c-format msgid "Manipuri" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2563 #, c-format msgid "Norwegian (Bokml)" msgstr "Norwegian (Bokmål)" -#: Merge.rc:2561 +#: Merge.rc:2564 #, c-format msgid "Norwegian (Nynorsk)" msgstr "" -#: Merge.rc:2562 +#: Merge.rc:2565 #, c-format msgid "Polski" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2566 #, c-format msgid "Portugese" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2567 #, c-format msgid "Portugese (Brazil)" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2568 #, c-format msgid "Romanian" msgstr "" -#: Merge.rc:2566 +#: Merge.rc:2569 #, c-format msgid "Russian" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2570 #, c-format msgid "Sanskrit" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2571 #, c-format msgid "Serbian (Latin)" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2572 #, c-format msgid "Serbian (Cyrillic)" msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2573 #, c-format msgid "Sindhi" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2579 #, c-format msgid "Slovak" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2580 #, c-format msgid "Slovenian" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:2581 #, c-format msgid "Spanish" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:2582 #, c-format msgid "Spanish (Mexican)" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:2583 #, c-format msgid "Spanish (Modern)" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2584 #, c-format msgid "Spanish (Guatemala)" msgstr "" -#: Merge.rc:2582 +#: Merge.rc:2585 #, c-format msgid "Spanish (Costa Rica)" msgstr "" -#: Merge.rc:2583 +#: Merge.rc:2586 #, c-format msgid "Spanish (Panama)" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2587 #, c-format msgid "Spanish (Dominican)" msgstr "" -#: Merge.rc:2585 +#: Merge.rc:2588 #, c-format msgid "Spanish (Venezuela)" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:2589 #, c-format msgid "Spanish (Colombia)" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2590 #, c-format msgid "Spanish (Peru)" msgstr "" -#: Merge.rc:2588 +#: Merge.rc:2591 #, c-format msgid "Spanish (Argentina)" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2592 #, c-format msgid "Spanish (Ecuador)" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2593 #, c-format msgid "Spanish (Chile)" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2594 #, c-format msgid "Spanish (Uruguay)" msgstr "" -#: Merge.rc:2597 +#: Merge.rc:2600 #, c-format msgid "Spanish (Paraguay)" msgstr "" -#: Merge.rc:2598 +#: Merge.rc:2601 #, c-format msgid "Spanish (Bolivia)" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2602 #, c-format msgid "Spanish (El Salvador)" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:2603 #, c-format msgid "Spanish (Honduras)" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2604 #, c-format msgid "Spanish (Nicaragua)" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2605 #, c-format msgid "Spanish (Puerto Rico)" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2606 #, c-format msgid "Swahili (Kenya)" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2607 #, c-format msgid "Swedish" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2608 #, c-format msgid "Swedish (Finland)" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2609 #, c-format msgid "Tamil" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2610 #, c-format msgid "Tatar (Tatarstan)" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2611 #, c-format msgid "Thai" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2612 #, c-format msgid "Turkish" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2613 #, c-format msgid "Ukranian" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2614 #, c-format msgid "Urdu (Pakistan)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2615 #, c-format msgid "Urdu (India)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2621 #, c-format msgid "Uzbek (Latin)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2622 #, c-format msgid "Uzbek (Cyrillic)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2623 #, c-format msgid "Vietnamese" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2629 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2630 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2631 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2632 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2633 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2631 -#: Merge.rc:2641 +#: Merge.rc:2634 +#: Merge.rc:2644 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2640 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2641 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2642 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2643 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2650 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2651 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2657 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2658 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2659 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2660 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2661 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2662 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2663 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2664 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2665 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2666 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2672 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2673 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2674 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2675 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2676 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2677 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2683 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2684 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2685 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2686 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2687 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2688 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2689 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2690 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2691 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2692 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2693 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2694 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2695 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2696 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2702 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2703 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2704 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2705 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2706 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2707 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2716 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2719 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2720 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2721 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2722 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2728 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2729 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2730 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2731 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2738 #, c-format msgid " B" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2739 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2740 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2741 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2742 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2743 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2750 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2751 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2752 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2753 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2754 #, c-format msgid "Change left file/dir read-only status" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2755 #, c-format msgid "Change right file/dir read-only status" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2756 #, c-format msgid "Convert EOL to DOS mode" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2757 #, c-format msgid "Convert EOL to UNIX mode" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2758 #, c-format msgid "Convert EOL to MAC mode" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2759 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2760 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2767 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2768 #, c-format msgid "" "Go to line or difference\n" "Go to (Ctrl+G)" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2769 #, c-format msgid "" "Set program options\n" "Options" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2770 #, c-format msgid "" "Refresh display\n" "Refresh (F5)" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2771 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2772 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2773 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2774 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2775 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2776 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2782 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2783 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2784 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2785 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2786 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2787 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2793 #, c-format msgid "" "Select the font for the view\n" "Select View Font" msgstr "" -#: Merge.rc:2791 +#: Merge.rc:2794 #, c-format msgid "" "Revert to using the default system font for view\n" "Default Font" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2795 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2793 +#: Merge.rc:2796 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2794 +#: Merge.rc:2797 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2795 +#: Merge.rc:2798 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2799 #, c-format msgid "" "Select the current user interfacce language\n" "Language" msgstr "" -#: Merge.rc:2797 +#: Merge.rc:2800 #, c-format msgid "" "Shows differences inside lines with different color\n" "Show Line Diff" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2801 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2802 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2803 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2804 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2805 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2806 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2812 #, c-format msgid "" "Scroll to the previous difference\n" "Prev Diff (Alt+Up)" msgstr "" -#: Merge.rc:2810 +#: Merge.rc:2813 #, c-format msgid "" "Scroll to the next difference\n" "Next Diff (Alt+Down)" msgstr "" -#: Merge.rc:2811 +#: Merge.rc:2814 #, c-format msgid "" "Scroll to the first difference\n" "First Diff (Alt+Home)" msgstr "" -#: Merge.rc:2812 +#: Merge.rc:2815 #, c-format msgid "" "Scroll to the current difference\n" "Current Diff (Alt+Enter)" msgstr "" -#: Merge.rc:2813 +#: Merge.rc:2816 #, c-format msgid "" "Scroll to the last difference\n" "Last Diff (Alt+End)" msgstr "" -#: Merge.rc:2814 +#: Merge.rc:2817 #, c-format msgid "" "Copy the selected text to the right file\n" "Copy Right (Alt+Right)" msgstr "" -#: Merge.rc:2815 +#: Merge.rc:2818 #, c-format msgid "" "Copy the selected text to the left file\n" "Copy Left (Alt+Left)" msgstr "" -#: Merge.rc:2816 +#: Merge.rc:2819 #, c-format msgid "" "Copy difference to right and advance to next\n" "Copy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2817 +#: Merge.rc:2820 #, c-format msgid "" "Copy difference to left and advance to next\n" "Copy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2818 +#: Merge.rc:2821 #, c-format msgid "" "Copy all differences to the right file\n" "All Right" msgstr "" -#: Merge.rc:2819 +#: Merge.rc:2822 #, c-format msgid "" "Copy all differences to the left file\n" "All Left" msgstr "" -#: Merge.rc:2820 +#: Merge.rc:2823 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2821 +#: Merge.rc:2824 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2827 +#: Merge.rc:2830 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2828 +#: Merge.rc:2831 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2829 +#: Merge.rc:2832 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2830 +#: Merge.rc:2833 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2836 +#: Merge.rc:2839 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2837 +#: Merge.rc:2840 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2838 +#: Merge.rc:2841 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2839 +#: Merge.rc:2842 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2840 +#: Merge.rc:2843 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2841 +#: Merge.rc:2844 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2842 +#: Merge.rc:2845 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2848 +#: Merge.rc:2851 #, c-format msgid "" "Activates next file visible\n" "Active next File" msgstr "" -#: Merge.rc:2849 +#: Merge.rc:2852 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2855 +#: Merge.rc:2858 #, c-format msgid "" "Displays the WinMerge User's Guide\n" "Help" msgstr "" -#: Merge.rc:2856 +#: Merge.rc:2859 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2857 +#: Merge.rc:2860 #, c-format msgid "Display the GNU public license" msgstr "" -#: Merge.rc:2858 +#: Merge.rc:2861 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2859 +#: Merge.rc:2862 #, c-format msgid "" "Opens WinMerge Help Index\n" "Help Index" msgstr "" -#: Merge.rc:2860 +#: Merge.rc:2863 #, c-format msgid "" "Opens WinMerge Help Search\n" "Help Search" msgstr "" -#: Merge.rc:2861 +#: Merge.rc:2864 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2867 +#: Merge.rc:2865 +#, c-format +msgid "Opens the translations website\nTranslations" +msgstr "" + +#: Merge.rc:2871 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2868 +#: Merge.rc:2872 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2869 +#: Merge.rc:2873 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2871 +#: Merge.rc:2875 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2872 +#: Merge.rc:2876 #, c-format msgid "" msgstr "" -#: Merge.rc:2873 +#: Merge.rc:2877 #, c-format msgid "" msgstr "" -#: Merge.rc:2879 +#: Merge.rc:2883 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2880 +#: Merge.rc:2884 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2881 +#: Merge.rc:2885 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2887 +#: Merge.rc:2891 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2888 +#: Merge.rc:2892 #, c-format msgid "Display all moved blacks" msgstr "" -#: Merge.rc:2889 +#: Merge.rc:2893 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2890 +#: Merge.rc:2894 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2891 +#: Merge.rc:2895 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2892 +#: Merge.rc:2896 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2898 +#: Merge.rc:2902 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2899 +#: Merge.rc:2903 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2900 +#: Merge.rc:2904 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2907 +#: Merge.rc:2911 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2908 +#: Merge.rc:2912 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2909 +#: Merge.rc:2913 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2910 +#: Merge.rc:2914 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2911 +#: Merge.rc:2915 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2912 +#: Merge.rc:2916 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2913 +#: Merge.rc:2917 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2914 +#: Merge.rc:2918 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2915 +#: Merge.rc:2919 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2916 +#: Merge.rc:2920 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2917 +#: Merge.rc:2921 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2918 +#: Merge.rc:2922 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2919 +#: Merge.rc:2923 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2920 +#: Merge.rc:2924 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2921 +#: Merge.rc:2925 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2922 +#: Merge.rc:2926 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2923 +#: Merge.rc:2927 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2924 +#: Merge.rc:2928 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2925 +#: Merge.rc:2929 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2926 +#: Merge.rc:2930 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2927 +#: Merge.rc:2931 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2928 +#: Merge.rc:2932 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2929 +#: Merge.rc:2933 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2930 +#: Merge.rc:2934 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2931 +#: Merge.rc:2935 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2932 +#: Merge.rc:2936 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2933 +#: Merge.rc:2937 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2934 +#: Merge.rc:2938 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2935 +#: Merge.rc:2939 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2936 +#: Merge.rc:2940 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2937 +#: Merge.rc:2941 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2942 +#: Merge.rc:2946 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2943 +#: Merge.rc:2947 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2944 +#: Merge.rc:2948 #, c-format msgid "Show big toolbar" msgstr "" -- 2.11.0