Thread: [Winmerge-svn] SF.net SVN: winmerge:[5672] trunk/Src/Languages
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2008-07-24 08:24:07
|
Revision: 5672 http://winmerge.svn.sourceforge.net/winmerge/?rev=5672&view=rev Author: kimmov Date: 2008-07-24 08:24:04 +0000 (Thu, 24 Jul 2008) Log Message: ----------- Commit updated POT and PO files. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/English.pot trunk/Src/Languages/French.po trunk/Src/Languages/German.po trunk/Src/Languages/Greek.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Japanese.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po trunk/Src/Languages/Ukrainian.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2008-07-24 08:20:55 UTC (rev 5671) +++ trunk/Src/Languages/Brazilian.po 2008-07-24 08:24:04 UTC (rev 5672) @@ -74,7 +74,7 @@ #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:508 #, c-format msgid "&Copy" msgstr "&Copiar" @@ -86,7 +86,7 @@ msgstr "&Colar" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:589 #, c-format msgid "&Goto..." msgstr "&Ir para..." @@ -97,62 +97,64 @@ msgstr "Ab&rir" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:531 +#: Merge.rc:537 #, c-format msgid "with &Registered Application" msgstr "com &o Aplicativo Registrado" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:532 +#: Merge.rc:538 #, c-format msgid "with &External Editor" msgstr "com &o Editor Externo" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:533 +#: Merge.rc:539 #, c-format msgid "&with..." msgstr "&com..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:312 #, c-format msgid "&File" msgstr "&Arquivo" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:314 #, c-format msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:315 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:316 #, c-format msgid "Op&en Conflict File..." msgstr "Ab&rir o Arquivo do Conflito..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:318 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir Pro&jeto...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:319 #, c-format msgid "Sa&ve Project..." msgstr "Sa&lvar Projeto..." @@ -163,1916 +165,1935 @@ msgstr "Projetos Recentes" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:351 #, c-format msgid "E&xit" msgstr "S&air" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:353 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:387 #, c-format msgid "&Options..." msgstr "&Op\xE7\xF5es..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:389 #, c-format msgid "&View" msgstr "&Visualizar" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:228 +#: Merge.rc:391 #, c-format msgid "Select &Font..." msgstr "Selecionar a &Fonte..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:229 +#: Merge.rc:392 #, c-format msgid "Use Default F&ont" msgstr "Usar a Fonte P&adr\xE3o" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Toolbar" msgstr "&Barra de ferramentas" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&None" msgstr "&Nenhum" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "&Small" msgstr "&Pequeno" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:235 +#: Merge.rc:417 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:237 +#: Merge.rc:419 #, c-format msgid "&Status Bar" msgstr "&Barra de Status" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:238 +#: Merge.rc:420 #, c-format msgid "Ta&b Bar" msgstr "Ba&rra das Abas" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:241 +#: Merge.rc:424 #, c-format msgid "&Language..." msgstr "&Idioma..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:262 +#: Merge.rc:446 #, c-format msgid "&Tools" msgstr "&Ferramentas" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Filters..." msgstr "&Filtros..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:266 +#: Merge.rc:449 #, c-format msgid "&Generate Patch..." msgstr "&Gerar Patch..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:271 +#: Merge.rc:454 #, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:273 +#: Merge.rc:456 +#, c-format msgid "&Manual Unpacking" msgstr "&Desempacotamento Manual" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:274 +#: Merge.rc:457 #, c-format msgid "&Automatic Unpacking" msgstr "&Desempacotamento Autom\xE1tico" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:276 +#: Merge.rc:459 #, c-format msgid "&Edit with Unpacker" msgstr "&Editar com o Desempacotador" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Reload plugins" msgstr "&Recarregar plugins" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:280 +#: Merge.rc:468 #, c-format msgid "&Debug" msgstr "&Debug" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:282 +#: Merge.rc:470 #, c-format msgid "&Load Config..." msgstr "&Carregar Config..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "&Reset Options" msgstr "&Resetar as Op\xE7\xF5es" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:285 +#: Merge.rc:473 #, c-format msgid "&Window" msgstr "&Janela" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:287 +#: Merge.rc:475 #, c-format msgid "Cl&ose" msgstr "Fe&char" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Clo&se All" msgstr "Fec&har Tudo" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "Change &Pane\tF6" msgstr "Mudar o &Painel\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:292 +#: Merge.rc:480 #, c-format msgid "Tile &Horizontally" msgstr "Lado a Lado &Horizontalmente" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:293 +#: Merge.rc:481 #, c-format msgid "Tile &Vertically" msgstr "Lado a Lado &Verticalmente" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&Cascade" msgstr "&Em Cascata" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1893 +#: Merge.rc:175 +#: Merge.rc:296 +#: Merge.rc:484 +#: Merge.rc:1920 #, c-format msgid "&Help" msgstr "&Ajuda" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Ajuda do WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:300 +#: Merge.rc:488 #, c-format msgid "R&elease Notes" msgstr "N&otas sobre o Lan\xE7amento" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&Translations" msgstr "&Tradu\xE7\xF5es" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "C&onfiguration" msgstr "C&onfigura\xE7\xE3o" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:303 +#: Merge.rc:491 #, c-format msgid "A&rchive Support disabled..." msgstr "S&uporte para Arquivos desativado..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:305 +#: Merge.rc:493 #, c-format msgid "&GNU General Public License" msgstr "&GNU Licen\xE7a para o P\xFAblico em Geral" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:306 +#: Merge.rc:494 #, c-format msgid "&About WinMerge..." msgstr "&Sobre o WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:337 #, c-format msgid "L&eft Read-only" msgstr "S&omente-Leitura a Esquerda" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:338 #, c-format msgid "Ri&ght Read-only" msgstr "S&omente-Leitura a Direita" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "Codifi&ca\xE7\xE3o do Arquivo" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:363 #, c-format msgid "Select &All\tCtrl+A" msgstr "Selecio&nar Tudo\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Mostr&ar Itens Id\xEAnticos" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Mostr&ar Itens Diferentes" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostra&r os Itens \xDAnicos a Esquerda" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar &os Itens \xDAnicos a Direita" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Mostra&r os Itens Pulados" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "M&ostrar Arquivos Bin\xE1rios" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar os &Itens Escondidos" -#: Merge.rc:232 +#: Merge.rc:224 #, c-format +msgid "Tree &Mode" +msgstr "" + +#: Merge.rc:225 +#, c-format +msgid "E&xpand All Subfolders" +msgstr "" + +#: Merge.rc:226 +#, c-format +msgid "&Collapse All Subfolders" +msgstr "" + +#: Merge.rc:239 +#, c-format msgid "Compa&re Statistics" msgstr "Compa&rar as Estat\xEDsticas" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:243 +#: Merge.rc:426 #, c-format msgid "Refre&sh\tF5" msgstr "Atuali&zar\tF5" -#: Merge.rc:237 +#: Merge.rc:244 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Atualizar os Selecionados\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:246 +#: Merge.rc:428 #, c-format msgid "&Merge" msgstr "&Unir" -#: Merge.rc:241 +#: Merge.rc:248 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparar\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Diferen\xE7a Seguinte\tAlt+Pra Baixo" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Diferen\xE7a Anterior\tAlt+Pra Cima" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Primeira Diferen\xE7a\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Diferen\xE7a Atual\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:255 +#: Merge.rc:435 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&\xDAltima Diferen\xE7a\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:257 +#: Merge.rc:437 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar p&ara a Direita\tAlt+Direita" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:258 +#: Merge.rc:438 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar p&ara a Esquerda\tAlt+Esquerda" -#: Merge.rc:253 +#: Merge.rc:260 #, c-format msgid "&Delete\tDel" msgstr "&Apagar\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:264 +#: Merge.rc:562 #, c-format msgid "&Customize Columns..." msgstr "&Personalizar as Colunas..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:267 +#: Merge.rc:450 #, c-format msgid "Generate &Report..." msgstr "Gerar &Relat\xF3rio..." -#: Merge.rc:311 +#: Merge.rc:321 #, c-format msgid "&Save\tCtrl+S" msgstr "&Salvar\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:322 #, c-format msgid "Save &Left" msgstr "Salvar &a Esquerda" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:324 +#: Merge.rc:329 #, c-format msgid "&Save" msgstr "&Salvar" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:325 +#: Merge.rc:330 #, c-format msgid "Save &As..." msgstr "Salvar &Como..." -#: Merge.rc:317 +#: Merge.rc:327 #, c-format msgid "Save &Right" msgstr "Salvar &a Direita" -#: Merge.rc:323 +#: Merge.rc:333 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:324 +#: Merge.rc:334 #, c-format msgid "Page Se&tup" msgstr "Configu&ra\xE7\xE3o da P\xE1gina" -#: Merge.rc:325 +#: Merge.rc:335 #, c-format msgid "Print Previe&w" msgstr "Pr\xE9-Visualiz&a\xE7\xE3o da Impress\xE3o" -#: Merge.rc:330 +#: Merge.rc:340 #, c-format msgid "&Convert Line Endings to" msgstr "&Converter os Finais das Linhas para" -#: Merge.rc:332 +#: Merge.rc:342 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:343 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:344 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:347 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modo de Uni\xE3o\tF9" -#: Merge.rc:339 +#: Merge.rc:349 #, c-format msgid "&File Encoding..." msgstr "&Codifica\xE7\xE3o do Arquivo..." -#: Merge.rc:345 +#: Merge.rc:355 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfazer\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:356 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refazer\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:358 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Co&rtar\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:359 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:360 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Colar\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:362 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecionar a &Diferen\xE7a da Linha\tF4" -#: Merge.rc:355 +#: Merge.rc:365 #, c-format msgid "F&ind...\tCtrl+F" msgstr "A&char...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:366 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Subst&ituir...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:368 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:360 -#: Merge.rc:2709 +#: Merge.rc:370 +#: Merge.rc:2757 #, c-format msgid "< Empty >" msgstr "< Vazio >" -#: Merge.rc:363 +#: Merge.rc:373 #, c-format msgid "Advanced" msgstr "Avan\xE7ado" -#: Merge.rc:365 +#: Merge.rc:375 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copiar Com Os N\xFAmeros das Linhas\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:378 #, c-format msgid "&Bookmarks" msgstr "&Bookmarks" -#: Merge.rc:370 +#: Merge.rc:380 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Ativar o Bookmark\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:381 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Bookmark Seguinte\tF2" -#: Merge.rc:372 +#: Merge.rc:382 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Bookmark Anterior\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:383 #, c-format msgid "&Clear All Bookmarks" msgstr "&Limpar Todos os Bookmarks" -#: Merge.rc:375 +#: Merge.rc:385 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ir Para...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:393 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:385 +#: Merge.rc:395 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Mais &Zoom\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:396 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Menos &Zoom\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:397 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:399 #, c-format msgid "Syntax Highlight" msgstr "Destacar a Sintaxe" -#: Merge.rc:394 +#: Merge.rc:404 #, c-format msgid "&Lock Panes" msgstr "&Trancar os Pain\xE9is" -#: Merge.rc:395 +#: Merge.rc:405 #, c-format msgid "&View Whitespace" msgstr "&Visualizar os Espa\xE7os em Branco" -#: Merge.rc:396 +#: Merge.rc:406 #, c-format msgid "Vie&w Line Differences" msgstr "Vis&ualizar as Diferen\xE7as das Linhas" -#: Merge.rc:397 +#: Merge.rc:407 #, c-format msgid "View Line &Numbers" msgstr "Visualizar &os N\xFAmeros das Linhas" -#: Merge.rc:398 +#: Merge.rc:408 #, c-format msgid "View &Margins" msgstr "Visual&izar as Margens" -#: Merge.rc:399 +#: Merge.rc:409 #, c-format msgid "W&rap Lines" msgstr "O&rganizar as Linhas" -#: Merge.rc:401 +#: Merge.rc:411 #, c-format msgid "Sw&ap Panes" msgstr "Tr&ocar os Pain\xE9is" -#: Merge.rc:411 +#: Merge.rc:421 #, c-format msgid "Diff &Pane" msgstr "Pain&el da Diferen\xE7a" -#: Merge.rc:412 +#: Merge.rc:422 #, c-format msgid "Lo&cation Pane" msgstr "Pa&inel de Localiza\xE7\xE3o" -#: Merge.rc:430 +#: Merge.rc:440 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiar para a Direita e Avan\xE7ar\tAlt+Ctrl+Direita" -#: Merge.rc:431 +#: Merge.rc:441 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar ¶ a Esquerda e Avan\xE7ar\tAlt+Ctrl+Esquerda" -#: Merge.rc:433 +#: Merge.rc:443 #, c-format msgid "Copy &All to Right" msgstr "Copiar &Tudo para a Direita" -#: Merge.rc:434 +#: Merge.rc:444 #, c-format msgid "Cop&y All to Left" msgstr "Cop&iar Tudo para a Esquerda" -#: Merge.rc:449 +#: Merge.rc:461 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:490 +#: Merge.rc:502 #, c-format msgid "Comp&are" msgstr "Comp&arar" -#: Merge.rc:491 +#: Merge.rc:503 #, c-format msgid "Co&mpare Special" msgstr "Co&mparar Especial" -#: Merge.rc:493 +#: Merge.rc:505 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:510 #, c-format msgid "&Left to Right" msgstr "&Esquerda para a Direita" -#: Merge.rc:499 +#: Merge.rc:511 #, c-format msgid "L&eft to..." msgstr "E&squerda para..." -#: Merge.rc:500 +#: Merge.rc:512 #, c-format msgid "&Right to Left" msgstr "&Direita para a Esquerda" -#: Merge.rc:501 +#: Merge.rc:513 #, c-format msgid "R&ight to..." msgstr "D&ireita para..." -#: Merge.rc:503 +#: Merge.rc:515 #, c-format msgid "&Move" msgstr "&Mover" -#: Merge.rc:505 +#: Merge.rc:517 #, c-format msgid "&Left to..." msgstr "&Esquerda para..." -#: Merge.rc:506 +#: Merge.rc:518 #, c-format msgid "&Right to..." msgstr "&Direita para..." -#: Merge.rc:508 +#: Merge.rc:520 #, c-format msgid "&Delete" msgstr "&Apagar" -#: Merge.rc:510 -#: Merge.rc:1130 -#: Merge.rc:1512 +#: Merge.rc:522 +#: Merge.rc:1140 +#: Merge.rc:1522 #, c-format msgid "&Left" msgstr "&Esquerda" -#: Merge.rc:511 -#: Merge.rc:1132 -#: Merge.rc:1515 +#: Merge.rc:523 +#: Merge.rc:1142 +#: Merge.rc:1525 #, c-format msgid "&Right" msgstr "&Direita" -#: Merge.rc:512 +#: Merge.rc:524 #, c-format msgid "&Both" msgstr "&Ambos" -#: Merge.rc:514 +#: Merge.rc:526 #, c-format msgid "Re&name" msgstr "Re&nomear" -#: Merge.rc:515 +#: Merge.rc:527 #, c-format msgid "&Hide Items" msgstr "&Esconder os Itens" -#: Merge.rc:517 +#: Merge.rc:529 #, c-format msgid "&Open Left" msgstr "&Abrir a Esquerda" -#: Merge.rc:523 +#: Merge.rc:535 #, c-format msgid "O&pen Right" msgstr "A&brir a Direita" -#: Merge.rc:530 +#: Merge.rc:542 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&iar os nomes dos caminhos" -#: Merge.rc:532 +#: Merge.rc:544 #, c-format msgid "&Left (%1 of %2)" msgstr "&Esquerda (%1 de %2)" -#: Merge.rc:533 +#: Merge.rc:545 #, c-format msgid "&Right (%1 of %2)" msgstr "&Direita (%1 de %\xA82)" -#: Merge.rc:534 +#: Merge.rc:546 #, c-format msgid "&Both (%1 of %2)" msgstr "&Ambos (%1 de %2)" -#: Merge.rc:536 +#: Merge.rc:548 #, c-format msgid "Copy &Filenames" msgstr "Copiar &os nomes dos arquivos" -#: Merge.rc:538 +#: Merge.rc:550 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:540 +#: Merge.rc:552 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Esquerda... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:553 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Direita... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:554 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Ambos... (%1 de %2)" -#: Merge.rc:543 +#: Merge.rc:555 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Diferen\xE7as... (%1 de %2)" -#: Merge.rc:546 +#: Merge.rc:558 #, c-format msgid "&Refresh" msgstr "&Atualizar" -#: Merge.rc:558 +#: Merge.rc:570 #, c-format msgid "&Copy Full Path" msgstr "&Copiar o Caminho Completo" -#: Merge.rc:559 +#: Merge.rc:571 #, c-format msgid "Copy &Filename" msgstr "Copiar &o nome do arquivo" -#: Merge.rc:565 +#: Merge.rc:577 #, c-format msgid "Prediffer Settings" msgstr "Configura\xE7\xF5es do Prediffer" -#: Merge.rc:567 +#: Merge.rc:579 #, c-format msgid "&No prediffer" msgstr "&Sem prediffer" -#: Merge.rc:568 +#: Merge.rc:580 #, c-format msgid "Auto prediffer" msgstr "Auto prediffer" -#: Merge.rc:576 +#: Merge.rc:588 #, c-format msgid "G&oto Diff" msgstr "I&r para a Diferen\xE7a" -#: Merge.rc:579 +#: Merge.rc:591 #, c-format msgid "&No Moved Blocks" msgstr "&Nenhum dos Blocos Movidos" -#: Merge.rc:580 +#: Merge.rc:592 #, c-format msgid "&All Moved Blocks" msgstr "&Todos os Blocos Movidos" -#: Merge.rc:581 +#: Merge.rc:593 #, c-format msgid "Moved Block for &Current Diff" msgstr "Bloco Movido par&a a Diferen\xE7a Atual" -#: Merge.rc:650 +#: Merge.rc:662 #, c-format msgid "About WinMerge" msgstr "Sobre o WinMerge" -#: Merge.rc:656 +#: Merge.rc:668 #, c-format msgid "(Private Build)" msgstr "(Build Privado)" -#: Merge.rc:657 +#: Merge.rc:669 #, c-format msgid "All rights reserved." msgstr "Todos os direitos reservados." -#: Merge.rc:658 +#: Merge.rc:670 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visitar a Home Page do WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:785 -#: Merge.rc:971 -#: Merge.rc:1049 -#: Merge.rc:1078 +#: Merge.rc:673 +#: Merge.rc:705 +#: Merge.rc:795 +#: Merge.rc:981 +#: Merge.rc:1059 #: Merge.rc:1088 -#: Merge.rc:1254 -#: Merge.rc:1318 -#: Merge.rc:1331 -#: Merge.rc:1423 -#: Merge.rc:1438 +#: Merge.rc:1098 +#: Merge.rc:1264 +#: Merge.rc:1328 +#: Merge.rc:1341 +#: Merge.rc:1433 +#: Merge.rc:1448 +#: Merge.rc:1670 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:674 #, c-format msgid "Contributors" msgstr "Contribuidores" -#: Merge.rc:669 +#: Merge.rc:681 #, c-format msgid "Select Files or Folders" msgstr "Selecionar Arquivos ou Pastas" -#: Merge.rc:672 -#: Merge.rc:1589 +#: Merge.rc:684 +#: Merge.rc:1599 #, c-format msgid "&Left:" msgstr "&Esquerda:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:992 -#: Merge.rc:1014 +#: Merge.rc:688 +#: Merge.rc:749 +#: Merge.rc:1002 +#: Merge.rc:1024 #, c-format msgid "&Browse..." msgstr "&Procurar..." -#: Merge.rc:677 -#: Merge.rc:1593 +#: Merge.rc:689 +#: Merge.rc:1603 #, c-format msgid "&Right:" msgstr "&Direita:" -#: Merge.rc:681 -#: Merge.rc:1025 +#: Merge.rc:693 +#: Merge.rc:1035 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." -#: Merge.rc:682 -#: Merge.rc:1597 +#: Merge.rc:694 +#: Merge.rc:1607 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:685 -#: Merge.rc:1599 +#: Merge.rc:697 +#: Merge.rc:1609 #, c-format msgid "Select..." msgstr "Selecionar..." -#: Merge.rc:686 +#: Merge.rc:698 #, c-format msgid "&Unpacker:" msgstr "&Desempacotador:" -#: Merge.rc:689 +#: Merge.rc:701 #, c-format msgid "&Select..." msgstr "&Selecionar..." -#: Merge.rc:690 -#: Merge.rc:1600 +#: Merge.rc:702 +#: Merge.rc:1610 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" -#: Merge.rc:692 +#: Merge.rc:704 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:786 -#: Merge.rc:816 -#: Merge.rc:848 +#: Merge.rc:706 +#: Merge.rc:736 +#: Merge.rc:796 +#: Merge.rc:826 #: Merge.rc:858 -#: Merge.rc:1050 -#: Merge.rc:1079 +#: Merge.rc:868 +#: Merge.rc:1060 #: Merge.rc:1089 -#: Merge.rc:1140 -#: Merge.rc:1255 -#: Merge.rc:1332 -#: Merge.rc:1424 -#: Merge.rc:1439 +#: Merge.rc:1099 +#: Merge.rc:1150 +#: Merge.rc:1265 +#: Merge.rc:1342 +#: Merge.rc:1434 +#: Merge.rc:1449 +#: Merge.rc:1671 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:695 -#: Merge.rc:1333 +#: Merge.rc:707 +#: Merge.rc:1343 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:696 +#: Merge.rc:708 #, c-format msgid "Files or Folders to Compare" msgstr "Arquivos ou Pastas para Comparar" -#: Merge.rc:703 +#: Merge.rc:715 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:720 #, c-format msgid "Database:" msgstr "Base de dados:" -#: Merge.rc:711 +#: Merge.rc:723 #, c-format msgid "Project:" msgstr "Projeto:" -#: Merge.rc:714 +#: Merge.rc:726 #, c-format msgid "User:" msgstr "Usu\xE1rio:" -#: Merge.rc:716 +#: Merge.rc:728 #, c-format msgid "Password:" msgstr "Senha:" -#: Merge.rc:718 +#: Merge.rc:730 #, c-format msgid "Link to Destination VSS project" msgstr "Link para o projeto VSS Destino" -#: Merge.rc:720 -#: Merge.rc:863 +#: Merge.rc:732 +#: Merge.rc:873 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" -#: Merge.rc:722 +#: Merge.rc:734 #, c-format msgid "Check Out" msgstr "Veja Isso" -#: Merge.rc:723 -#: Merge.rc:859 +#: Merge.rc:735 +#: Merge.rc:869 #, c-format msgid "Save As..." msgstr "Salvar Como..." -#: Merge.rc:729 +#: Merge.rc:741 #, c-format msgid "Versioning System" msgstr "Sistema de Vers\xF5es" -#: Merge.rc:732 +#: Merge.rc:744 #, c-format msgid "&Versioning System:" msgstr "&Sistema de Vers\xF5es:" -#: Merge.rc:735 +#: Merge.rc:747 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1901 +#: Merge.rc:754 +#: Merge.rc:1928 #, c-format msgid "General" msgstr "Geral" -#: Merge.rc:745 +#: Merge.rc:757 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automaticame&nte rolar para a primeira diferen\xE7a" -#: Merge.rc:748 +#: Merge.rc:760 #, c-format msgid "&Disable Splash Screen" msgstr "&Desativar a Tela de Inicializa\xE7\xE3o" -#: Merge.rc:750 +#: Merge.rc:762 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fe&char as janelas com o ESC" -#: Merge.rc:752 +#: Merge.rc:764 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Automaticamente verificar os caminhos no di\xE1logo-Abrir" -#: Merge.rc:755 +#: Merge.rc:767 #, c-format msgid "All&ow only one instance to run" msgstr "Per&mitir apenas uma inst\xE2ncia a executar" -#: Merge.rc:757 +#: Merge.rc:769 #, c-format msgid "As&k when closing multiple windows" msgstr "Pe&rguntar quando fechar m\xFAltiplas janelas" -#: Merge.rc:759 +#: Merge.rc:771 #, c-format msgid "&Preserve file time in file compare" msgstr "&Preservar a hora do arquivo na compara\xE7\xE3o dos arquivos" -#: Merge.rc:762 +#: Merge.rc:774 #, c-format -msgid "E&nable plugins" -msgstr "" - -#: Merge.rc:764 -#, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-Conclus\xE3o do di\xE1logo-Abrir:" -#: Merge.rc:767 +#: Merge.rc:777 #, c-format msgid "Enable multiple compare windows for" msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:779 +#: Merge.rc:1622 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" -#: Merge.rc:771 -#: Merge.rc:1614 +#: Merge.rc:781 +#: Merge.rc:1624 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" -#: Merge.rc:773 +#: Merge.rc:783 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o bot\xE3o Resetar para tornar todas as caixas de mensagens vis\xEDveis de novo." -#: Merge.rc:775 +#: Merge.rc:785 #, c-format msgid "Reset" msgstr "Resetar" -#: Merge.rc:782 +#: Merge.rc:792 #, c-format msgid "Language" msgstr "Idiomas" -#: Merge.rc:789 +#: Merge.rc:799 #, c-format msgid "Available languages:" msgstr "Idiomas dispon\xEDveis:" -#: Merge.rc:795 +#: Merge.rc:805 #, c-format msgid "Find" msgstr "Achar" -#: Merge.rc:798 -#: Merge.rc:825 +#: Merge.rc:808 +#: Merge.rc:835 #, c-format msgid "Fi&nd what:" msgstr "Ac&har:" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Match &whole word only" msgstr "Combinar &apenas palavras inteiras" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:813 +#: Merge.rc:843 #, c-format msgid "Match &case" msgstr "Combinar &com o caso sensitivo" -#: Merge.rc:805 -#: Merge.rc:835 +#: Merge.rc:815 +#: Merge.rc:845 #, c-format msgid "Regular &expression" msgstr "Express&\xE3o regular" -#: Merge.rc:807 +#: Merge.rc:817 #, c-format msgid "D&on't wrap end of file" msgstr "N&\xE3o organizar o final do arquivo" -#: Merge.rc:810 +#: Merge.rc:820 #, c-format msgid "Direction" msgstr "Dire\xE7\xE3o" -#: Merge.rc:811 +#: Merge.rc:821 #, c-format msgid "&Up" msgstr "&Pra cima" -#: Merge.rc:813 +#: Merge.rc:823 #, c-format msgid "&Down" msgstr "&Pra baixo" -#: Merge.rc:815 -#: Merge.rc:845 +#: Merge.rc:825 +#: Merge.rc:855 #, c-format msgid "&Find Next" msgstr "&Achar o Pr\xF3ximo" -#: Merge.rc:822 +#: Merge.rc:832 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:828 +#: Merge.rc:838 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:837 +#: Merge.rc:847 #, c-format msgid "&Don't wrap end of file" msgstr "&N\xE3o organizar o final do arquivo" -#: Merge.rc:840 +#: Merge.rc:850 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:841 +#: Merge.rc:851 #, c-format msgid "&Selection" msgstr "&Sele\xE7\xE3o" -#: Merge.rc:843 +#: Merge.rc:853 #, c-format msgid "Wh&ole file" msgstr "No &arquivo inteiro" -#: Merge.rc:846 +#: Merge.rc:856 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:847 +#: Merge.rc:857 #, c-format msgid "Replace &All" msgstr "Substituir &Tudo" -#: Merge.rc:854 -#: Merge.rc:2136 +#: Merge.rc:864 +#: Merge.rc:2169 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:857 +#: Merge.rc:867 #, c-format msgid "CheckOut" msgstr "Veja Isso" -#: Merge.rc:862 -#: Merge.rc:1174 +#: Merge.rc:872 +#: Merge.rc:1184 #, c-format msgid "Comments" msgstr "Coment\xE1rios" -#: Merge.rc:865 +#: Merge.rc:875 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ap\xF3s o checkout" -#: Merge.rc:871 +#: Merge.rc:881 #, c-format msgid "Linefilters" msgstr "Filtros das linhas" -#: Merge.rc:874 +#: Merge.rc:884 #, c-format msgid "Enable Line Filters" msgstr "Ativar os Filtros das Linhas" -#: Merge.rc:877 +#: Merge.rc:887 #, c-format msgid "Regular Expressions (one per line):" msgstr "Express\xF5es Regulares (uma por linha):" -#: Merge.rc:884 +#: Merge.rc:894 #, c-format msgid "Save" msgstr "Salvar" -#: Merge.rc:885 +#: Merge.rc:895 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:886 +#: Merge.rc:896 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:887 +#: Merge.rc:897 #, c-format msgid "Remove" msgstr "Remover" -#: Merge.rc:892 -#: Merge.rc:1904 +#: Merge.rc:902 +#: Merge.rc:1931 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:895 +#: Merge.rc:905 #, c-format msgid "Difference:" msgstr "Diferen\xE7a:" -#: Merge.rc:899 +#: Merge.rc:909 #, c-format msgid "Selected Difference:" msgstr "Diferen\xE7a Selecionada:" -#: Merge.rc:903 -#: Merge.rc:1564 +#: Merge.rc:913 +#: Merge.rc:1574 #, c-format msgid "Background" msgstr "2\xBA Plano" -#: Merge.rc:904 +#: Merge.rc:914 #, c-format msgid "Deleted" msgstr "Apagado" -#: Merge.rc:917 -#: Merge.rc:1359 -#: Merge.rc:1565 +#: Merge.rc:927 +#: Merge.rc:1369 +#: Merge.rc:1575 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:921 +#: Merge.rc:931 #, c-format msgid "Ignored Difference:" msgstr "Diferen\xE7a Ignorada:" -#: Merge.rc:931 +#: Merge.rc:941 #, c-format msgid "Moved:" msgstr "Movido:" -#: Merge.rc:941 +#: Merge.rc:951 #, c-format msgid "Selected Moved:" msgstr "Selecionado o Movido:" -#: Merge.rc:948 +#: Merge.rc:958 #, c-format msgid "Word Difference:" msgstr "Diferen\xE7a das Palavras:" -#: Merge.rc:955 +#: Merge.rc:965 #, c-format msgid "Selected Word Diff:" msgstr "Diferen\xE7a das Palavras Selecionadas:" -#: Merge.rc:962 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1177 -#: Merge.rc:1405 +#: Merge.rc:972 +#: Merge.rc:1058 +#: Merge.rc:1087 +#: Merge.rc:1187 +#: Merge.rc:1415 #, c-format msgid "Defaults" msgstr "Padr\xF5es" -#: Merge.rc:968 -#: Merge.rc:1347 -#: Merge.rc:1553 +#: Merge.rc:978 +#: Merge.rc:1357 +#: Merge.rc:1563 #, c-format msgid "Dialog" msgstr "Di\xE1logo" -#: Merge.rc:978 -#: Merge.rc:1907 +#: Merge.rc:988 +#: Merge.rc:1934 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:981 +#: Merge.rc:991 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:983 +#: Merge.rc:993 #, c-format msgid "Integration" msgstr "Integra\xE7\xE3o" -#: Merge.rc:984 +#: Merge.rc:994 #, c-format msgid "&Add to explorer context menu" msgstr "&Adicionar ao menu de contexto do explorer" -#: Merge.rc:986 +#: Merge.rc:996 #, c-format msgid "E&nable advanced menu" msgstr "A&tivar o menu avan\xE7ado" -#: Merge.rc:988 +#: Merge.rc:998 #, c-format msgid "In&clude subfolders by default" msgstr "In&cluir as sub-pastas por padr\xE3o" -#: Merge.rc:990 +#: Merge.rc:1000 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:993 +#: Merge.rc:1003 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:995 +#: Merge.rc:1005 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:996 +#: Merge.rc:1006 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos tempor\xE1rios" -#: Merge.rc:997 +#: Merge.rc:1007 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta tempor\xE1ria do sistema" -#: Merge.rc:999 +#: Merge.rc:1009 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1002 -#: Merge.rc:1018 +#: Merge.rc:1012 +#: Merge.rc:1028 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:1008 +#: Merge.rc:1018 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1011 +#: Merge.rc:1021 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1015 +#: Merge.rc:1025 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1019 +#: Merge.rc:1029 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1020 +#: Merge.rc:1030 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1022 +#: Merge.rc:1032 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1026 +#: Merge.rc:1036 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1027 +#: Merge.rc:1037 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1030 +#: Merge.rc:1040 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1033 +#: Merge.rc:1043 #, c-format msgid "W&hitespaces" msgstr "E&spa\xE7os em branco" -#: Merge.rc:1034 +#: Merge.rc:1044 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:1036 +#: Merge.rc:1046 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudan\xE7as" -#: Merge.rc:1038 +#: Merge.rc:1048 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:1040 +#: Merge.rc:1050 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1042 +#: Merge.rc:1052 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:1044 +#: Merge.rc:1054 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1046 +#: Merge.rc:1056 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1068 +#: Merge.rc:1078 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1074 +#: Merge.rc:1084 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1075 +#: Merge.rc:1085 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1085 +#: Merge.rc:1095 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1090 +#: Merge.rc:1100 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1093 +#: Merge.rc:1103 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o" -#: Merge.rc:1096 +#: Merge.rc:1106 #, c-format msgid "Extensions list:" msgstr "Lista das extens\xF5es:" -#: Merge.rc:1097 +#: Merge.rc:1107 #, c-format msgid "Description:" msgstr "Descri\xE7\xE3o:" -#: Merge.rc:1108 +#: Merge.rc:1118 #, c-format msgid " Folder Compare Progress" msgstr " Progresso da Compara\xE7\xE3o das Pastas" -#: Merge.rc:1111 -#: Merge.rc:1854 +#: Merge.rc:1121 +#: Merge.rc:1881 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1116 +#: Merge.rc:1126 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1117 +#: Merge.rc:1127 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1118 +#: Merge.rc:1128 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1124 +#: Merge.rc:1134 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1127 +#: Merge.rc:1137 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1129 +#: Merge.rc:1139 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1134 +#: Merge.rc:1144 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1135 +#: Merge.rc:1145 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1137 +#: Merge.rc:1147 #, c-format msgid "&Difference" msgstr "&Diferen\xE7a" -#: Merge.rc:1139 +#: Merge.rc:1149 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1145 -#: Merge.rc:1902 +#: Merge.rc:1155 +#: Merge.rc:1929 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1148 +#: Merge.rc:1158 #, c-format msgid "Whitespace" msgstr "Espa\xE7o em branco" -#: Merge.rc:1149 +#: Merge.rc:1159 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1151 +#: Merge.rc:1161 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudan\xE7a" -#: Merge.rc:1153 +#: Merge.rc:1163 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1155 +#: Merge.rc:1165 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1157 +#: Merge.rc:1167 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1159 +#: Merge.rc:1169 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:1162 +#: Merge.rc:1172 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos" -#: Merge.rc:1164 +#: Merge.rc:1174 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1166 +#: Merge.rc:1176 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos" -#: Merge.rc:1169 +#: Merge.rc:1179 #, c-format msgid "&File Compare method:" msgstr "&M\xE9todo para Comparar Arquivos:" -#: Merge.rc:1172 +#: Merge.rc:1182 #, c-format msgid "S&top after first difference" msgstr "P&arar ap\xF3s a primeira diferen\xE7a" -#: Merge.rc:1175 +#: Merge.rc:1185 #, c-format msgid "Filter Comments" msgstr "Coment\xE1rios do Filtro" -#: Merge.rc:1182 -#: Merge.rc:1903 +#: Merge.rc:1192 +#: Merge.rc:1930 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1185 +#: Merge.rc:1195 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1187 +#: Merge.rc:1197 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento autom\xE1tico" -#: Merge.rc:1189 +#: Merge.rc:1199 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1191 +#: Merge.rc:1201 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1192 +#: Merge.rc:1202 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1195 +#: Merge.rc:1205 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1197 +#: Merge.rc:1207 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espa\xE7os" -#: Merge.rc:1199 +#: Merge.rc:1209 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferen\xE7as das Linhas" -#: Merge.rc:1201 +#: Merge.rc:1211 #, c-format msgid "View line differences" msgstr "Visualizar as diferen\xE7as das linhas" -#: Merge.rc:1203 +#: Merge.rc:1213 #, c-format msgid "&Character level" msgstr "&N\xEDvel dos caracteres" -#: Merge.rc:1205 +#: Merge.rc:1215 #, c-format msgid "&Word-level:" msgstr "&N\xEDvel das palavras:" -#: Merge.rc:1220 +#: Merge.rc:1230 #, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1226 +#: Merge.rc:1236 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1227 +#: Merge.rc:1237 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1228 +#: Merge.rc:1238 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1229 +#: Merge.rc:1239 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1230 +#: Merge.rc:1240 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1236 +#: Merge.rc:1246 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1239 +#: Merge.rc:1249 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1242 +#: Merge.rc:1252 #, c-format msgid "&Save changes" msgstr "&Salvar mudan\xE7as" -#: Merge.rc:1244 +#: Merge.rc:1254 #, c-format msgid "&Discard changes" msgstr "&Descartar mudan\xE7as" -#: Merge.rc:1246 +#: Merge.rc:1256 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1249 +#: Merge.rc:1259 #, c-format msgid "S&ave changes" msgstr "S&alvar mudan\xE7as" -#: Merge.rc:1251 +#: Merge.rc:1261 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudan\xE7as" -#: Merge.rc:1253 +#: Merge.rc:1263 #, c-format msgid "Discard All" msgstr "Descartar Tudo" -#: Merge.rc:1260 -#: Merge.rc:1508 -#: Merge.rc:1909 +#: Merge.rc:1270 +#: Merge.rc:1518 +#: Merge.rc:1936 #, c-format msgid "Codepage" msgstr "C\xF3digo da p\xE1gina" -#: Merge.rc:1263 +#: Merge.rc:1273 #, c-format msgid "Default Codepage" msgstr "C\xF3digo da P\xE1gina Padr\xE3o" -#: Merge.rc:1264 +#: Merge.rc:1274 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:" -#: Merge.rc:1266 +#: Merge.rc:1276 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" "need to restart session" msgstr "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml - precisa reiniciar a sess\xE3o" -#: Merge.rc:1269 +#: Merge.rc:1279 #, c-format msgid "System codepage" msgstr "C\xF3digo de p\xE1gina do sistema" -#: Merge.rc:1271 +#: Merge.rc:1281 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge" -#: Merge.rc:1273 +#: Merge.rc:1283 #, c-format msgid "Custom codepage :" msgstr "C\xF3digo de p\xE1gina personalizado :" -#: Merge.rc:1281 +#: Merge.rc:1291 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suporte para arquivos desativado" -#: Merge.rc:1284 +#: Merge.rc:1294 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)" -#: Merge.rc:1287 +#: Merge.rc:1297 #, 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 "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada." -#: Merge.rc:1289 +#: Merge.rc:1299 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho." -#: Merge.rc:1291 +#: Merge.rc:1301 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis." -#: Merge.rc:1293 +#: Merge.rc:1303 #, c-format msgid "Version" msgstr "Vers\xE3o" -#: Merge.rc:1295 +#: Merge.rc:1305 #, c-format msgid "" "Plugin required\n" @@ -2081,54 +2102,54 @@ "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1297 +#: Merge.rc:1307 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Vers\xE3o recomendada do 7-Zip:" -#: Merge.rc:1300 -#: Merge.rc:1303 +#: Merge.rc:1310 +#: Merge.rc:1313 #, c-format msgid "present" msgstr "atual" -#: Merge.rc:1301 +#: Merge.rc:1311 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1304 +#: Merge.rc:1314 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado no seu computador:" -#: Merge.rc:1306 -#: Merge.rc:1311 +#: Merge.rc:1316 +#: Merge.rc:1321 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1308 +#: Merge.rc:1318 #, c-format msgid "missing" msgstr "faltando" -#: Merge.rc:1309 +#: Merge.rc:1319 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:" -#: Merge.rc:1313 +#: Merge.rc:1323 #, c-format msgid "outdated" msgstr "desatualizado" -#: Merge.rc:1314 +#: Merge.rc:1324 #, c-format msgid "Plugins on path:" msgstr "Plugins no caminho:" -#: Merge.rc:1315 +#: Merge.rc:1325 #, c-format msgid "" "Don't display this &message again.\n" @@ -2137,78 +2158,76 @@ "N\xE3o exibir esta mensagem de novo.\n" "(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)" -#: Merge.rc:1319 +#: Merge.rc:1329 #, c-format msgid "Plugin Download" msgstr "Download do Plugin" -#: Merge.rc:1328 +#: Merge.rc:1338 #, c-format msgid "Options" msgstr "Op\xE7\xF5es" -#: Merge.rc:1339 +#: Merge.rc:1349 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1341 +#: Merge.rc:1351 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1342 +#: Merge.rc:1352 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1350 +#: Merge.rc:1360 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1351 +#: Merge.rc:1361 #, c-format msgid "Function names:" msgstr "Nomes das fun\xE7\xF5es:" -#: Merge.rc:1352 +#: Merge.rc:1362 #, c-format msgid "Comments:" msgstr "Coment\xE1rios:" -#: Merge.rc:1353 +#: Merge.rc:1363 #, c-format msgid "Numbers:" msgstr "N\xFAmeros:" -#: Merge.rc:1354 +#: Merge.rc:1364 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1355 +#: Merge.rc:1365 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1356 +#: Merge.rc:1366 #, c-format msgid "Preprocessor:" msgstr "Pr\xE9-processador:" -#: Merge.rc:1357 +#: Merge.rc:1367 #, c-format msgid "User 1:" msgstr "Usu\xE1rio 1:" -#: Merge.rc:1358 +#: Merge.rc:1368 #, c-format msgid "User 2:" msgstr "Usu\xE1rio 2:" -#: Merge.rc:1363 -#: Merge.rc:1368 #: Merge.rc:1373 #: Merge.rc:1378 #: Merge.rc:1383 @@ -2216,409 +2235,422 @@ #: Merge.rc:1393 #: Merge.rc:1398 #: Merge.rc:1403 +#: Merge.rc:1408 +#: Merge.rc:1413 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1411 +#: Merge.rc:1421 #, c-format msgid "Folder Compare Report" msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas" -#: Merge.rc:1414 +#: Merge.rc:1424 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1417 -#: Merge.rc:1591 -#: Merge.rc:1595 -#: Merge.rc:1622 +#: Merge.rc:1427 +#: Merge.rc:1601 +#: Merge.rc:1605 +#: Merge.rc:1632 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1418 +#: Merge.rc:1428 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1421 +#: Merge.rc:1431 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a \xC1rea de Transfer\xEAncia" -#: Merge.rc:1429 +#: Merge.rc:1439 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1432 +#: Merge.rc:1442 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro voc\xEA quer criar?" -#: Merge.rc:1434 +#: Merge.rc:1444 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)" -#: Merge.rc:1436 +#: Merge.rc:1446 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)" -#: Merge.rc:1444 -#: Merge.rc:1910 +#: Merge.rc:1454 +#: Merge.rc:1937 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1447 +#: Merge.rc:1457 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:" -#: Merge.rc:1449 +#: Merge.rc:1459 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar o Plugin do 7-zip" -#: Merge.rc:1450 +#: Merge.rc:1460 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1452 +#: Merge.rc:1462 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usar 7-zip isolado se dispon\xEDvel" -#: Merge.rc:1455 +#: Merge.rc:1465 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sar 7-Zip local da pasta do WinMerge" -#: Merge.rc:1457 +#: Merge.rc:1467 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1465 +#: Merge.rc:1475 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estat\xEDsticas" -#: Merge.rc:1468 +#: Merge.rc:1478 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1469 +#: Merge.rc:1479 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1470 -#: Merge.rc:2278 +#: Merge.rc:1480 +#: Merge.rc:2315 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1471 +#: Merge.rc:1481 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1474 -#: Merge.rc:1493 +#: Merge.rc:1484 +#: Merge.rc:1503 #, c-format msgid "Binary:" msgstr "Bin\xE1rio:" -#: Merge.rc:1477 +#: Merge.rc:1487 #, c-format msgid "Unique" msgstr "\xDAnico" -#: Merge.rc:1478 +#: Merge.rc:1488 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1483 +#: Merge.rc:1493 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1488 -#: Merge.rc:2273 +#: Merge.rc:1498 +#: Merge.rc:2310 #, c-format msgid "Identical" msgstr "Id\xEAnticos" -#: Merge.rc:1497 +#: Merge.rc:1507 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1502 +#: Merge.rc:1512 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1511 +#: Merge.rc:1521 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1514 -#: Merge.rc:1517 +#: Merge.rc:1524 +#: Merge.rc:1527 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1518 +#: Merge.rc:1528 #, c-format msgid "Select Codepage for" msgstr "Selecionar o C\xF3digo da P\xE1gina para" -#: Merge.rc:1519 +#: Merge.rc:1529 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1521 -#: Merge.rc:1524 +#: Merge.rc:1531 +#: Merge.rc:1534 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1522 +#: Merge.rc:1532 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1525 +#: Merge.rc:1535 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos" -#: Merge.rc:1528 +#: Merge.rc:1538 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1529 -#: Merge.rc:1876 +#: Merge.rc:1539 +#: Merge.rc:1903 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1534 +#: Merge.rc:1544 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1537 +#: Merge.rc:1547 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1539 +#: Merge.rc:1549 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1541 +#: Merge.rc:1551 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1543 +#: Merge.rc:1553 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1547 +#: Merge.rc:1557 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1548 +#: Merge.rc:1558 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1556 +#: Merge.rc:1566 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1559 +#: Merge.rc:1569 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1561 +#: Merge.rc:1571 #, c-format msgid "Whitespace:" msgstr "Espa\xE7o vazio:" -#: Merge.rc:1562 +#: Merge.rc:1572 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1563 +#: Merge.rc:1573 #, c-format msgid "Selection:" msgstr "Sele\xE7\xE3o:" -#: Merge.rc:1586 +#: Merge.rc:1596 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1592 +#: Merge.rc:1602 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1596 +#: Merge.rc:1606 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1602 +#: Merge.rc:1612 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1603 +#: Merge.rc:1613 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1608 -#: Merge.rc:1911 +#: Merge.rc:1618 +#: Merge.rc:1938 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1611 +#: Merge.rc:1621 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1616 +#: Merge.rc:1626 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1617 +#: Merge.rc:1627 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1619 +#: Merge.rc:1629 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1623 +#: Merge.rc:1633 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1624 +#: Merge.rc:1634 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extens\xE3o .bak" -#: Merge.rc:1626 +#: Merge.rc:1636 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1633 +#: Merge.rc:1643 +#: Merge.rc:2225 #, c-format msgid "Confirm Copy" msgstr "Confirmar a C\xF3pia" -#: Merge.rc:1637 +#: Merge.rc:1647 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?" -#: Merge.rc:1639 +#: Merge.rc:1649 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1642 +#: Merge.rc:1652 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1645 +#: Merge.rc:1655 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1646 +#: Merge.rc:1656 #, c-format msgid "No" msgstr "N\xE3o" +#: Merge.rc:1662 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1665 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1671 +#: Merge.rc:1695 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1687 +#: Merge.rc:1711 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1702 +#: Merge.rc:1726 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1708 +#: Merge.rc:1732 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1709 +#: Merge.rc:1733 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1710 +#: Merge.rc:1734 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1711 +#: Merge.rc:1735 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1712 +#: Merge.rc:1736 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1713 +#: Merge.rc:1737 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1719 +#: Merge.rc:1743 #, c-format msgid "" "Create empty documents\n" @@ -2627,7 +2659,7 @@ "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:1720 +#: Merge.rc:1744 #, c-format msgid "" "Open an existing document\n" @@ -2636,7 +2668,7 @@ "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1721 +#: Merge.rc:1745 #, c-format msgid "" "Close the active document\n" @@ -2645,7 +2677,7 @@ "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1722 +#: Merge.rc:1746 #, c-format msgid "" "Save the active document\n" @@ -2654,7 +2686,7 @@ "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:1723 +#: Merge.rc:1747 #, c-format msgid "" "Save the active document with a new name\n" @@ -2663,7 +2695,7 @@ "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:1724 +#: Merge.rc:1748 #, c-format msgid "" "Change the printing options\n" @@ -2672,7 +2704,7 @@ "Mudar as op\xE7\xF5es de impress\xE3o\n" "Configurar P\xE1gina" -#: Merge.rc:1725 +#: Merge.rc:1749 #, c-format msgid "" "Change the printer and printing options\n" @@ -2681,7 +2713,7 @@ "Mudar a impressora e as op\xE7\xF5es de impress\xE3o\n" "Configurar a impress\xE3o" -#: Merge.rc:1726 +#: Merge.rc:1750 #, c-format msgid "" "Print the active document\n" @@ -2690,7 +2722,7 @@ "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:1727 +#: Merge.rc:1751 #, c-format msgid "" "Display full pages\n" @@ -2699,13 +2731,28 @@ "Exibir p\xE1ginas completas\n" "Pr\xE9-Visualizar Impress\xE3o" -#: Merge.rc:1732 +#: Merge.rc:1756 #, c-format msgid "Make all hidden items visible again" msgstr "Tornar todos os itens escondidos vis\xEDveis de novo" -#: Merge.rc:1738 +#: Merge.rc:1757 #, c-format +msgid "Toggle tree mode" +msgstr "" + +#: Merge.rc:1758 +#, c-format +msgid "Expand all subfolders"... [truncated message content] |
From: <ki...@us...> - 2008-08-04 14:11:06
|
Revision: 5732 http://winmerge.svn.sourceforge.net/winmerge/?rev=5732&view=rev Author: kimmov Date: 2008-08-04 14:10:59 +0000 (Mon, 04 Aug 2008) Log Message: ----------- Update PO files from latest POT file. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/French.po trunk/Src/Languages/German.po trunk/Src/Languages/Greek.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Japanese.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po trunk/Src/Languages/Ukrainian.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2008-08-04 14:08:25 UTC (rev 5731) +++ trunk/Src/Languages/Brazilian.po 2008-08-04 14:10:59 UTC (rev 5732) @@ -722,7 +722,7 @@ msgstr "&Scripts" #: Merge.rc:370 -#: Merge.rc:2757 +#: Merge.rc:2758 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -2341,7 +2341,7 @@ msgstr "Arquivos:" #: Merge.rc:1480 -#: Merge.rc:2315 +#: Merge.rc:2316 #, c-format msgid "Different" msgstr "Diferente" @@ -3369,7 +3369,7 @@ msgstr "Tamanho" #: Merge.rc:2013 -#: Merge.rc:2621 +#: Merge.rc:2622 #, c-format msgid "Name" msgstr "Nome" @@ -3390,7 +3390,7 @@ msgstr "[F] " #: Merge.rc:2017 -#: Merge.rc:2623 +#: Merge.rc:2624 #, c-format msgid "Description" msgstr "Descri\xE7\xE3o" @@ -3907,8 +3907,7 @@ " Por favor, verifique a spec da config da visualiza\xE7\xE3o usada." #: Merge.rc:2166 -#: Merge.rc:2605 -#: Merge.rc:2793 +#: Merge.rc:2606 #, c-format msgid "None" msgstr "Nenhum" @@ -4340,7 +4339,7 @@ msgstr "Diferen\xE7as" #: Merge.rc:2297 -#: Merge.rc:2601 +#: Merge.rc:2602 #, c-format msgid "Binary" msgstr "Bin\xE1rio" @@ -4392,190 +4391,195 @@ #: Merge.rc:2313 #, c-format +msgid "Folders are different" +msgstr "" + +#: Merge.rc:2314 +#, c-format msgid "Left Only" msgstr "Apenas a Esquerda" -#: Merge.rc:2314 +#: Merge.rc:2315 #, c-format msgid "Right Only" msgstr "Apenas a Direita" -#: Merge.rc:2316 +#: Merge.rc:2317 #, c-format msgid "Error" msgstr "Erro" -#: Merge.rc:2322 +#: Merge.rc:2323 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2323 +#: Merge.rc:2324 #, c-format msgid "1 item selected" msgstr "1 item selecionado" -#: Merge.rc:2324 +#: Merge.rc:2325 #, c-format msgid "%1 items selected" msgstr "%1 itens selecionados" -#: Merge.rc:2330 +#: Merge.rc:2331 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou nome da pasta." -#: Merge.rc:2331 +#: Merge.rc:2332 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome da sub-pasta quando as sub-pastas s\xE3o inclu\xEDdas." -#: Merge.rc:2332 +#: Merge.rc:2333 #, c-format msgid "Comparison result, long form." msgstr "Resultado da compara\xE7\xE3o, formul\xE1rio longo" -#: Merge.rc:2333 +#: Merge.rc:2334 #, c-format msgid "Left side modification date." msgstr "Data de modifica\xE7\xE3o do lado esquerdo." -#: Merge.rc:2334 +#: Merge.rc:2335 #, c-format msgid "Right side modification date." msgstr "Data de modifica\xE7\xE3o do lado direito." -#: Merge.rc:2335 +#: Merge.rc:2336 #, c-format msgid "File's extension." msgstr "Extens\xE3o do arquivo." -#: Merge.rc:2336 +#: Merge.rc:2337 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do arquivo a esquerda em bytes." -#: Merge.rc:2337 +#: Merge.rc:2338 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do arquivo a direita em bytes." -#: Merge.rc:2338 +#: Merge.rc:2339 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do arquivo a esquerda abreviado." -#: Merge.rc:2339 +#: Merge.rc:2340 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do arquivo a direita abreviado." -#: Merge.rc:2345 +#: Merge.rc:2346 #, c-format msgid "Left side creation time." msgstr "Hora de cria\xE7\xE3o do lado esquerdo." -#: Merge.rc:2346 +#: Merge.rc:2347 #, c-format msgid "Right side creation time." msgstr "Hora da cria\xE7\xE3o do lado direito." -#: Merge.rc:2347 +#: Merge.rc:2348 #, c-format msgid "Tells which side has newer modification date." msgstr "Diz qual lado tem a data de modifica\xE7\xE3o mais nova." -#: Merge.rc:2348 +#: Merge.rc:2349 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Vers\xE3o do arquivo do lado esquerdo, s\xF3 para alguns tipos de arquivos." -#: Merge.rc:2349 +#: Merge.rc:2350 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Vers\xE3o do arquivo do lado direito, s\xF3 para alguns tipos de arquivos." -#: Merge.rc:2350 +#: Merge.rc:2351 #, c-format msgid "Short comparison result." msgstr "Resultado curto da compara\xE7\xE3o." -#: Merge.rc:2351 +#: Merge.rc:2352 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2352 +#: Merge.rc:2353 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2353 +#: Merge.rc:2354 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo do lado esquerdo" -#: Merge.rc:2354 +#: Merge.rc:2355 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo do lado direito" -#: Merge.rc:2360 +#: Merge.rc:2361 #, c-format msgid "Left side encoding." msgstr "Codifica\xE7\xE3o do lado esquerdo." -#: Merge.rc:2361 +#: Merge.rc:2362 #, c-format msgid "Right side encoding." msgstr "Codfica\xE7\xE3o do lado direito." -#: Merge.rc:2362 +#: Merge.rc:2363 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "N\xFAmero de diferen\xE7as ignoradas no arquivo. Estas diferen\xE7as s\xE3o ignoradas pelo WinMerge e n\xE3o podem ser unidas." -#: Merge.rc:2363 +#: Merge.rc:2364 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "N\xFAmero de diferen\xE7as no arquivo. Este n\xFAmero n\xE3o inclui as diferen\xE7as ignoradas." -#: Merge.rc:2364 +#: Merge.rc:2365 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostrar um asterisco (*) se o arquivo \xE9 bin\xE1rio." -#: Merge.rc:2370 +#: Merge.rc:2371 #, c-format msgid "Compare %1 with %2" msgstr "Comparar o %1 com o %2" -#: Merge.rc:2371 +#: Merge.rc:2372 #, c-format msgid "Comma-separated list" msgstr "Lista separada por v\xEDrgula" -#: Merge.rc:2372 +#: Merge.rc:2373 #, c-format msgid "Tab-separated list" msgstr "Lista separada por aba" -#: Merge.rc:2373 +#: Merge.rc:2374 #, c-format msgid "Simple HTML" msgstr "HTML Simples" -#: Merge.rc:2374 +#: Merge.rc:2375 #, c-format msgid "Simple XML" msgstr "XML Simples" -#: Merge.rc:2376 +#: Merge.rc:2377 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "O arquivo do relat\xF3rio j\xE1 existe. Voc\xEA quer sobrescrever o arquivo existente?" -#: Merge.rc:2377 +#: Merge.rc:2378 #, c-format msgid "" "Error creating the report:\n" @@ -4584,32 +4588,32 @@ "Erro ao criar o relat\xF3rio:\n" "%1" -#: Merge.rc:2378 +#: Merge.rc:2379 #, c-format msgid "The report has been created successfully." msgstr "O relat\xF3rio foi criado com sucesso." -#: Merge.rc:2384 +#: Merge.rc:2385 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo est\xE1 aberto em ambos os pain\xE9is." -#: Merge.rc:2385 +#: Merge.rc:2386 #, c-format msgid "The selected files are identical." msgstr "Os arquivos selecionados s\xE3o id\xEAnticos." -#: Merge.rc:2386 +#: Merge.rc:2387 #, c-format msgid "An error occurred while comparing the files." msgstr "Um erro ocoreu enquanto comparava os arquivos." -#: Merge.rc:2387 +#: Merge.rc:2388 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Os arquivos tempor\xE1rios n\xE3o puderam ser criados. Verifique suas configura\xE7\xF5es do caminho dos tempor\xE1rios." -#: Merge.rc:2388 +#: Merge.rc:2389 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4624,7 +4628,7 @@ "\n" "Nota: Se voc\xEA quer sempre tratar todos os tipos de retorno de procedimentos como equivalentes, configure a op\xE7\xE3o 'Ignorar diferen\xE7as de retorno dos procedimentos..' na aba Comparar do di\xE1logo das op\xE7\xF5es (dispon\xEDvel em Editar/Op\xE7\xF5es)." -#: Merge.rc:2389 +#: Merge.rc:2390 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4635,22 +4639,22 @@ " Com as op\xE7\xF5es atuais, eles ser\xE3o unificados ao tipo principal.\n" " Voc\xEA quer mudar as op\xE7\xF5es e preservar os EOL diferentes?" -#: Merge.rc:2390 +#: Merge.rc:2391 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Um erro ocorreu enquanto prediffing o arquivo '%1' com o plugin '%2'. O prediffing n\xE3o est\xE1 mais aplicado." -#: Merge.rc:2391 +#: Merge.rc:2392 #, c-format msgid "The selected folder is invalid." msgstr "A pasta selecionada \xE9 inv\xE1lida." -#: Merge.rc:2392 +#: Merge.rc:2393 #, c-format msgid "Cannot open a binary file to editor." msgstr "N\xE3o pode abrir um arquivo bin\xE1rio no editor." -#: Merge.rc:2393 +#: Merge.rc:2394 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4665,7 +4669,7 @@ "%1\n" "no outro lado e abrir estas pastas?" -#: Merge.rc:2399 +#: Merge.rc:2400 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4676,132 +4680,132 @@ "Exibir cada arquivo na sua p\xE1gina de c\xF3digo dar\xE1 uma melhor exibi\xE7\xE3o mas unir/copiar ser\xE1 perigoso.\n" "Voc\xEA gostaria de tratar ambos os arquivos como estando na p\xE1gina do c\xF3digo padr\xE3o do windows? (recomendado)" -#: Merge.rc:2400 +#: Merge.rc:2401 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Aviso: Os arquivos usam codifica\xE7\xF5es diferentes, esquerda=%s e direita=%s, e a uni\xE3o pode levar a perda de informa\xE7\xE3o." -#: Merge.rc:2401 +#: Merge.rc:2402 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informa\xE7\xE3o perdida devido a erros de codifica\xE7\xE3o: em ambos os arquivos" -#: Merge.rc:2402 +#: Merge.rc:2403 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informa\xE7\xE3o perdida devido a erros de codifica\xE7\xE3o: no arquivo direito" -#: Merge.rc:2403 +#: Merge.rc:2404 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informa\xE7\xE3o perdida devido a erros de codifica\xE7\xE3o: no arquivo esquerdo" -#: Merge.rc:2409 +#: Merge.rc:2410 #, c-format msgid "No difference" msgstr "Sem diferen\xE7a" -#: Merge.rc:2410 +#: Merge.rc:2411 #, c-format msgid "Line difference" msgstr "Diferen\xE7a da linha" -#: Merge.rc:2416 +#: Merge.rc:2417 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituiu %1 string(s)." -#: Merge.rc:2417 +#: Merge.rc:2418 #, c-format msgid "Cannot find string \"%s\"" msgstr "N\xE3o p\xF4de achar a string \"%s\"" -#: Merge.rc:2423 +#: Merge.rc:2424 #, c-format msgid "Copy Full Path" msgstr "Copiar o Caminho Completo" -#: Merge.rc:2424 +#: Merge.rc:2425 #, c-format msgid "Copy Filename" msgstr "Copiar o Nome do Arquivo" -#: Merge.rc:2430 +#: Merge.rc:2431 #, c-format msgid "Location Pane" msgstr "Painel de Localiza\xE7\xE3o" -#: Merge.rc:2431 +#: Merge.rc:2432 #, c-format msgid "Diff Pane" msgstr "Painel das Diferen\xE7as" -#: Merge.rc:2437 +#: Merge.rc:2438 #, c-format msgid "Patch file successfully written." msgstr "Arquivo patch gravado com sucesso." -#: Merge.rc:2438 +#: Merge.rc:2439 #, c-format msgid "1. item is not found or is directory!" msgstr "1. o item n\xE3o foi achado ou \xE9 diret\xF3rio!" -#: Merge.rc:2439 +#: Merge.rc:2440 #, c-format msgid "2. item is not found or is directory!" msgstr "2. o item n\xE3o foi achado ou \xE9 diret\xF3rio!" -#: Merge.rc:2440 +#: Merge.rc:2441 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O arquivo do patch j\xE1 existe. Voc\xEA quer sobrescrev\xEA-lo?" -#: Merge.rc:2441 +#: Merge.rc:2442 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos selecionados]" -#: Merge.rc:2442 +#: Merge.rc:2443 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2443 +#: Merge.rc:2444 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2444 +#: Merge.rc:2445 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2445 +#: Merge.rc:2446 #, c-format msgid "Could not write to file %1." msgstr "N\xE3o p\xF4de gravar no arquivo %1." -#: Merge.rc:2446 +#: Merge.rc:2447 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "O caminho de sa\xEDda especificado n\xE3o \xE9 um caminho absoluto: %1" -#: Merge.rc:2447 +#: Merge.rc:2448 #, c-format msgid "Specify an output file" msgstr "Especificar um arquivo de sa\xEDda" -#: Merge.rc:2448 +#: Merge.rc:2449 #, c-format msgid "Cannot create a patch file from binary files." msgstr "N\xE3o pode criar um arquivo patch dos arquivos bin\xE1rios." -#: Merge.rc:2449 +#: Merge.rc:2450 #, c-format msgid "Cannot create a patch file from directories." msgstr "N\xE3o pode criar um arquivo patch dos diret\xF3rios." -#: Merge.rc:2450 +#: Merge.rc:2451 #, c-format msgid "" "Please save all files first.\n" @@ -4812,17 +4816,17 @@ "\n" "Criar um patch requer que n\xE3o hajam mudan\xE7as n\xE3o salvas nos arquivos." -#: Merge.rc:2451 +#: Merge.rc:2452 #, c-format msgid "Folder does not exist." msgstr "A pasta n\xE3o existe." -#: Merge.rc:2456 +#: Merge.rc:2457 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Os resultados da compara\xE7\xE3o dos diret\xF3rios atuais ser\xE3o limpados." -#: Merge.rc:2457 +#: Merge.rc:2458 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4833,7 +4837,7 @@ "Todos os componentes necess\xE1rios (7-zip e/ou Merge7z*.dll) para o suporte para arquivos n\xE3o podem ser achados.\n" "Veja o manual para mais info sobre o suporte para arquivos e como ativ\xE1-lo." -#: Merge.rc:2458 +#: Merge.rc:2459 #, c-format msgid "" "\n" @@ -4842,7 +4846,7 @@ "\n" "Nota: A integra\xE7\xE3o do 7-Zip est\xE1 desativada nas configura\xE7\xF5es do WinMerge." -#: Merge.rc:2459 +#: Merge.rc:2460 #, c-format msgid "" "\n" @@ -4851,37 +4855,37 @@ "\n" "Nota: A integra\xE7\xE3o do 7-Zip est\xE1 restrita a opera\xE7\xE3o isolada nas configura\xE7\xF5es do WinMerge." -#: Merge.rc:2460 +#: Merge.rc:2461 #, c-format msgid "Select file for export" msgstr "Selecione o arquivo para exportar" -#: Merge.rc:2461 +#: Merge.rc:2462 #, c-format msgid "Select file for import" msgstr "Selecione o arquivo para importar" -#: Merge.rc:2462 +#: Merge.rc:2463 #, c-format msgid "Options imported from the file." msgstr "Op\xE7\xF5es importadas do arquivo" -#: Merge.rc:2463 +#: Merge.rc:2464 #, c-format msgid "Options exported to the file." msgstr "Op\xE7\xF5es exportadas para o arquivo." -#: Merge.rc:2464 +#: Merge.rc:2465 #, c-format msgid "Failed to import options from the file." msgstr "Falhou em importar as op\xE7\xF5es do arquivo." -#: Merge.rc:2465 +#: Merge.rc:2466 #, c-format msgid "Failed to write options to the file." msgstr "Falhou em gravar as op\xE7\xF5es no arquivo." -#: Merge.rc:2466 +#: Merge.rc:2467 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4892,493 +4896,493 @@ "\n" "Voc\xEA quer continuar?" -#: Merge.rc:2472 +#: Merge.rc:2473 #, c-format msgid "Regular expression error" msgstr "Erro da express\xE3o regular" -#: Merge.rc:2473 +#: Merge.rc:2474 #, c-format msgid "No match" msgstr "Nenhuma combina\xE7\xE3o" -#: Merge.rc:2474 +#: Merge.rc:2475 #, c-format msgid "Invalid regular expression" msgstr "Express\xE3o regular inv\xE1lida" -#: Merge.rc:2475 +#: Merge.rc:2476 #, c-format msgid "Invalid collation character" msgstr "Caractere de compara\xE7\xE3o inv\xE1lido" -#: Merge.rc:2476 +#: Merge.rc:2477 #, c-format msgid "Invalid character class name" msgstr "Nome da classe do caractere inv\xE1lido" -#: Merge.rc:2477 +#: Merge.rc:2478 #, c-format msgid "Trailing backslash" msgstr "Rastreando o backslash" -#: Merge.rc:2478 +#: Merge.rc:2479 #, c-format msgid "Invalid back reference" msgstr "Refer\xEAncia anterior inv\xE1lida" -#: Merge.rc:2479 +#: Merge.rc:2480 #, c-format msgid "Unmatched [ or [^" msgstr "N\xE3o compar\xE1vel [ ou [^ " -#: Merge.rc:2480 +#: Merge.rc:2481 #, c-format msgid "Unmatched ( or \\(" msgstr "N\xE3o compar\xE1vel ( ou \\(" -#: Merge.rc:2481 +#: Merge.rc:2482 #, c-format msgid "Unmatched \\{" msgstr "N\xE3o compar\xE1vel \\{" -#: Merge.rc:2482 +#: Merge.rc:2483 #, c-format msgid "Invalid content of \\{\\}" msgstr "Conte\xFAdo inv\xE1lido de \\{\\}" -#: Merge.rc:2483 +#: Merge.rc:2484 #, c-format msgid "Invalid range end" msgstr "Final do alcance inv\xE1lido" -#: Merge.rc:2484 +#: Merge.rc:2485 #, c-format msgid "Out of memory" msgstr "Sem mem\xF3ria" -#: Merge.rc:2485 +#: Merge.rc:2486 #, c-format msgid "Invalid preceding regular expression" msgstr "Express\xE3o regular precedente inv\xE1lida" -#: Merge.rc:2486 +#: Merge.rc:2487 #, c-format msgid "Premature end of regular expression" msgstr "Final prematuro da express\xE3o regular" -#: Merge.rc:2487 +#: Merge.rc:2488 #, c-format msgid "Regular expression too big" msgstr "Express\xE3o regular muito grande" -#: Merge.rc:2492 +#: Merge.rc:2493 #, c-format msgid "Unmatched ) or \\)" msgstr "N\xE3o compar\xE1vel ) ou \\)" -#: Merge.rc:2498 +#: Merge.rc:2499 #, c-format msgid "Western European" msgstr "Europeu Ocidental" -#: Merge.rc:2499 +#: Merge.rc:2500 #, c-format msgid "Eastern European" msgstr "Europeu Oriental" -#: Merge.rc:2500 +#: Merge.rc:2501 #, c-format msgid "East Asian" msgstr "Leste Asi\xE1tico" -#: Merge.rc:2501 +#: Merge.rc:2502 #, c-format msgid "SE & SW Asian" msgstr "Sudeste & Sudoeste Asi\xE1tico" -#: Merge.rc:2502 +#: Merge.rc:2503 #, c-format msgid "Middle Eastern" msgstr "Oriente M\xE9dio" -#: Merge.rc:2503 -#: Merge.rc:2513 +#: Merge.rc:2504 +#: Merge.rc:2514 #, c-format msgid "Not applicable" msgstr "N\xE3o aplic\xE1vel" -#: Merge.rc:2509 +#: Merge.rc:2510 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2510 +#: Merge.rc:2511 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2511 +#: Merge.rc:2512 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2512 +#: Merge.rc:2513 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2519 +#: Merge.rc:2520 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2520 +#: Merge.rc:2521 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cir\xEDlico" -#: Merge.rc:2526 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latim US" -#: Merge.rc:2527 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS \xC1rabe" -#: Merge.rc:2528 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grego" -#: Merge.rc:2529 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Margem do B\xE1ltico" -#: Merge.rc:2530 +#: Merge.rc:2531 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latim 1" -#: Merge.rc:2531 +#: Merge.rc:2532 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grego 1" -#: Merge.rc:2532 +#: Merge.rc:2533 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latim 2" -#: Merge.rc:2533 +#: Merge.rc:2534 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cir\xEDlico" -#: Merge.rc:2534 +#: Merge.rc:2535 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turco" -#: Merge.rc:2535 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugu\xEAs" -#: Merge.rc:2541 +#: Merge.rc:2542 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Island\xEAs" -#: Merge.rc:2542 +#: Merge.rc:2543 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreu" -#: Merge.rc:2543 +#: Merge.rc:2544 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Franc\xEAs do Canad\xE1" -#: Merge.rc:2544 +#: Merge.rc:2545 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS N\xF3rdico" -#: Merge.rc:2545 +#: Merge.rc:2546 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cir\xEDlico CIS 1" -#: Merge.rc:2546 +#: Merge.rc:2547 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grego 2" -#: Merge.rc:2552 +#: Merge.rc:2553 #, c-format msgid "Windows Thai" msgstr "Windows Tailand\xEAs" -#: Merge.rc:2553 +#: Merge.rc:2554 #, c-format msgid "Windows Japanese" msgstr "Windows Japon\xEAs" -#: Merge.rc:2554 +#: Merge.rc:2555 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chin\xEAs Simplificado" -#: Merge.rc:2555 +#: Merge.rc:2556 #, c-format msgid "Windows Korean" msgstr "Windows Coreano" -#: Merge.rc:2556 +#: Merge.rc:2557 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chin\xEAs Tradicional" -#: Merge.rc:2557 +#: Merge.rc:2558 #, c-format msgid "Windows Latin 2" msgstr "Windows Latim 2" -#: Merge.rc:2558 +#: Merge.rc:2559 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cir\xEDlico (Eslavo)" -#: Merge.rc:2559 +#: Merge.rc:2560 #, c-format msgid "Windows Latin 1" msgstr "Windows Latim 1" -#: Merge.rc:2560 +#: Merge.rc:2561 #, c-format msgid "Windows Greek" msgstr "Windows Grego" -#: Merge.rc:2561 +#: Merge.rc:2562 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latim 5 (Turco)" -#: Merge.rc:2562 +#: Merge.rc:2563 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreu" -#: Merge.rc:2563 +#: Merge.rc:2564 #, c-format msgid "Windows Arabic" msgstr "Windows \xC1rabe" -#: Merge.rc:2564 +#: Merge.rc:2565 #, c-format msgid "Windows Baltic Rim" msgstr "Windows da Margem do B\xE1ltico" -#: Merge.rc:2565 +#: Merge.rc:2566 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamita" -#: Merge.rc:2571 +#: Merge.rc:2572 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romano" -#: Merge.rc:2572 +#: Merge.rc:2573 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grego" -#: Merge.rc:2573 +#: Merge.rc:2574 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cir\xEDlico" -#: Merge.rc:2574 +#: Merge.rc:2575 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2575 +#: Merge.rc:2576 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh da Europa Central" -#: Merge.rc:2576 +#: Merge.rc:2577 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turco" -#: Merge.rc:2585 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-2" msgstr "Se aproxima do ISO-8859-2" -#: Merge.rc:2588 +#: Merge.rc:2589 #, c-format msgid "Approximates ISO-8859-1" msgstr "Se aproxima do ISO-8859-1" -#: Merge.rc:2589 +#: Merge.rc:2590 #, c-format msgid "Approximates ISO-8859-7" msgstr "Se aproxima do ISO-8859-7" -#: Merge.rc:2590 +#: Merge.rc:2591 #, c-format msgid "Approximates ISO-8859-9" msgstr "Se aproxima do ISO-8859-9" -#: Merge.rc:2591 +#: Merge.rc:2592 #, c-format msgid "Approximates ISO-8859-8" msgstr "Se aproxima do ISO-8859-8" -#: Merge.rc:2597 +#: Merge.rc:2598 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2598 +#: Merge.rc:2599 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2599 +#: Merge.rc:2600 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2600 +#: Merge.rc:2601 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2602 +#: Merge.rc:2603 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2603 +#: Merge.rc:2604 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2604 +#: Merge.rc:2605 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2611 +#: Merge.rc:2612 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2612 +#: Merge.rc:2613 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2613 +#: Merge.rc:2614 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2614 +#: Merge.rc:2615 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2615 +#: Merge.rc:2616 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2616 +#: Merge.rc:2617 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2622 +#: Merge.rc:2623 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2625 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2626 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2627 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2634 #, c-format msgid "Save the left file" msgstr "Salvar o arquivo a esquerda" -#: Merge.rc:2634 +#: Merge.rc:2635 #, c-format msgid "Save the right file" msgstr "Salvar o arquivo a direita" -#: Merge.rc:2635 +#: Merge.rc:2636 #, c-format msgid "Save the left file with name..." msgstr "Salvar o arquivo a esquerda com o nome..." -#: Merge.rc:2636 +#: Merge.rc:2637 #, c-format msgid "Save the right file with name..." msgstr "Salvar o arquivo a direita com o nome..." -#: Merge.rc:2637 -#, c-format -msgid "Change left file/dir read-only status" -msgstr "Mudar o status somente-leitura do arquivo/diret\xF3rio a esquerda" - #: Merge.rc:2638 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Mudar o status somente-leitura do arquivo/diret\xF3rio a direita" +msgid "Change left side file/folder read-only status" +msgstr "" #: Merge.rc:2639 #, c-format +msgid "Change right side file/folder read-only status" +msgstr "" + +#: Merge.rc:2640 +#, c-format msgid "Convert EOL to Windows mode" msgstr "Converter o EOL para o modo do Windows" -#: Merge.rc:2640 +#: Merge.rc:2641 #, c-format msgid "Convert EOL to Unix mode" msgstr "Converter o EOL para o modo do Unix" -#: Merge.rc:2641 +#: Merge.rc:2642 #, c-format msgid "Convert EOL to Mac mode" msgstr "Converter o EOL para o modo do Mac" -#: Merge.rc:2642 +#: Merge.rc:2643 #, c-format msgid "Switch between editing and merging modes" msgstr "Trocar entre os modos de edi\xE7\xE3o e uni\xE3o" -#: Merge.rc:2643 +#: Merge.rc:2644 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5387,12 +5391,12 @@ "Visualizar e ajustar as propriedades da codifica\xE7\xE3o do arquivo\n" "Propriedades da codifica\xE7\xE3o do arquivo" -#: Merge.rc:2644 +#: Merge.rc:2645 #, c-format msgid "Open and resolve conflict file" msgstr "Abrir e determinar o arquivo do conflito" -#: Merge.rc:2650 +#: Merge.rc:2651 #, c-format msgid "" "Select difference area in the current line\n" @@ -5401,7 +5405,7 @@ "Selecionar a \xE1rea da diferen\xE7a na linha atual\n" "Diferen\xE7a na Linha Atual" -#: Merge.rc:2651 +#: Merge.rc:2652 #, c-format msgid "" "Go to line or difference\n" @@ -5410,7 +5414,7 @@ "Ir para a linha ou diferen\xE7a\n" "Ir para (Ctrl+G)" -#: Merge.rc:2652 +#: Merge.rc:2653 #, c-format msgid "" "Set program options\n" @@ -5419,7 +5423,7 @@ "Definir as op\xE7\xF5es do programa\n" "Op\xE7\xF5es" -#: Merge.rc:2653 +#: Merge.rc:2654 #, c-format msgid "" "Refresh display\n" @@ -5428,37 +5432,37 @@ "Atualizar a exibi\xE7\xE3o\n" "Atualizar (F5)" -#: Merge.rc:2654 +#: Merge.rc:2655 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar as linhas selecionadas para a \xE1rea de transfer\xEAncia adicionando n\xFAmeros da linha ao come\xE7o da linha" -#: Merge.rc:2655 +#: Merge.rc:2656 #, c-format msgid "Refresh selected items" msgstr "Atualizar os itens selecionados" -#: Merge.rc:2656 +#: Merge.rc:2657 #, c-format msgid "Toggle bookmark" msgstr "Ativar o bookmark" -#: Merge.rc:2657 +#: Merge.rc:2658 #, c-format msgid "Go to next bookmark" msgstr "Ir para o bookmark seguinte" -#: Merge.rc:2658 +#: Merge.rc:2659 #, c-format msgid "Go to previous bookmark" msgstr "Ir para o bookmark anterior" -#: Merge.rc:2659 +#: Merge.rc:2660 #, c-format msgid "Clear all bookmarks" msgstr "Limpar todos os bookmarks" -#: Merge.rc:2665 +#: Merge.rc:2666 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5467,7 +5471,7 @@ "Exibe itens que s\xE3o exatamente os mesmos\n" "Mostrar Itens Id\xEAnticos" -#: Merge.rc:2666 +#: Merge.rc:2667 #, c-format msgid "" "Displays items that have differences\n" @@ -5476,7 +5480,7 @@ "Exibe itens que tem diferen\xE7as\n" "Mostrar Itens Diferentes" -#: Merge.rc:2667 +#: Merge.rc:2668 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5485,7 +5489,7 @@ "Exibe itens que existem apenas no lado esquerdo\n" "Mostrar Itens \xDAnicos a Esquerda" -#: Merge.rc:2668 +#: Merge.rc:2669 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5494,7 +5498,7 @@ "Exibe itens que existem apenas no lado direito\n" "Mostrar Itens \xDAnicos a Direita" -#: Merge.rc:2669 +#: Merge.rc:2670 #, c-format msgid "" "Displays binary files\n" @@ -5503,7 +5507,7 @@ "Exibe os arquivos bin\xE1rios\n" "Mostrar Arquivos Bin\xE1rios" -#: Merge.rc:2670 +#: Merge.rc:2671 #, c-format msgid "" "Displays skipped items\n" @@ -5512,7 +5516,7 @@ "Exibe os itens pulados\n" "Mostrar os Itens Pulados" -#: Merge.rc:2676 +#: Merge.rc:2677 #, c-format msgid "" "Select the font for the view\n" @@ -5521,7 +5525,7 @@ "Selecionar a fotne para a visualiza\xE7\xE3o\n" "Selecionar a Fonte para a Visualiza\xE7\xE3o" -#: Merge.rc:2677 +#: Merge.rc:2678 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5530,27 +5534,27 @@ "Reverter para usar a fonte padr\xE3o do sistema para a visualiza\xE7\xE3o\n" "Fonte Padr\xE3o" -#: Merge.rc:2678 +#: Merge.rc:2679 #, c-format msgid "Shows whitespace characters" msgstr "Mostrar os caracteres do espa\xE7o em branco" -#: Merge.rc:2679 +#: Merge.rc:2680 #, c-format msgid "Toggle Diff Pane" msgstr "Ativar o Painel das Diferen\xE7as" -#: Merge.rc:2680 +#: Merge.rc:2681 #, c-format msgid "Location pane shows overall picture from files" msgstr "O painel da localiza\xE7\xE3o mostra a fotografia global dos arquivos" -#: Merge.rc:2681 +#: Merge.rc:2682 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostrar o di\xE1logo das estat\xEDsticas de compara\xE7\xE3o das pastas" -#: Merge.rc:2682 +#: Merge.rc:2683 #, c-format msgid "" "Select the current user interface language\n" @@ -5559,7 +5563,7 @@ "Selecionar o idioma da interface do usu\xE1rio atual\n" "Idioma" -#: Merge.rc:2683 +#: Merge.rc:2684 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5568,12 +5572,12 @@ "Mostra as diferen\xE7as dentro das linhas com cores diferentes\n" "Mostrar a Diferen\xE7a das Linhas" -#: Merge.rc:2684 +#: Merge.rc:2685 #, c-format msgid "Swap the positions of the two panes" msgstr "Trocar as posi\xE7\xF5es dos dois pain\xE9is" -#: Merge.rc:2685 +#: Merge.rc:2686 #, c-format msgid "" "Shows line numbers\n" @@ -5582,7 +5586,7 @@ "Mostra os n\xFAmeros das linhas\n" "Mostrar os N\xFAmeros das Linhas" -#: Merge.rc:2686 +#: Merge.rc:2687 #, c-format msgid "" "Enable word wrap\n" @@ -5591,7 +5595,7 @@ "Ativar a organiza\xE7\xE3o das palavras\n" "Organizar as Linhas" -#: Merge.rc:2687 +#: Merge.rc:2688 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5600,22 +5604,22 @@ "Mostra as margens da sele\xE7\xE3o para ambos os pain\xE9is\n" "Mostrar as Margens da Sele\xE7\xE3o" -#: Merge.rc:2688 +#: Merge.rc:2689 #, c-format msgid "Increase text size" msgstr "Aumentar o tamanho do texto" -#: Merge.rc:2689 +#: Merge.rc:2690 #, c-format msgid "Decrease text size" msgstr "Diminuir o tamanho do texto" -#: Merge.rc:2690 +#: Merge.rc:2691 #, c-format msgid "Reset text zoom to default size" msgstr "Resetar o zoom do texto para o tamanho padr\xE3o" -#: Merge.rc:2696 +#: Merge.rc:2697 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5624,7 +5628,7 @@ "Rolar para o diferen\xE7a anterior\n" "Diferen\xE7a Anterior (Alt+Pra Cima)" -#: Merge.rc:2697 +#: Merge.rc:2698 #, c-format msgid "" "Scroll to the next difference\n" @@ -5633,7 +5637,7 @@ "Rolar para a diferen\xE7a seguinte\n" "Diferen\xE7a Seguinte (Alt+Pra baixo)" -#: Merge.rc:2698 +#: Merge.rc:2699 #, c-format msgid "" "Scroll to the first difference\n" @@ -5642,7 +5646,7 @@ "Rolar para a primeira diferen\xE7a\n" "Primeira Diferen\xE7a (Alt+Home)" -#: Merge.rc:2699 +#: Merge.rc:2700 #, c-format msgid "" "Scroll to the current difference\n" @@ -5651,7 +5655,7 @@ "Rolar para a diferen\xE7a atual\n" "Diferen\xE7a Atual (Alt+Enter)" -#: Merge.rc:2700 +#: Merge.rc:2701 #, c-format msgid "" "Scroll to the last difference\n" @@ -5660,7 +5664,7 @@ "Rolar para a \xFAltima diferen\xE7a\n" "\xDAltima Diferen\xE7a (Alt+End)" -#: Merge.rc:2701 +#: Merge.rc:2702 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5669,7 +5673,7 @@ "Copiar o texto selecionado para o arquivo da direita\n" "Copiar para a Direita (Alt+Direita)" -#: Merge.rc:2702 +#: Merge.rc:2703 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5678,7 +5682,7 @@ "Copiar o texto selecionado para o arquivo da esquerda\n" "Copiar para a Esquerda (Alt+Esquerda)" -#: Merge.rc:2703 +#: Merge.rc:2704 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5687,7 +5691,7 @@ "Copiar a diferen\xE7a para a direita e avan\xE7ar para a pr\xF3xima\n" "Copiar para a Direita e Avan\xE7ar (Ctrl+Alt+Direita)" -#: Merge.rc:2704 +#: Merge.rc:2705 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5696,7 +5700,7 @@ "Copiar a diferen\xE7a para a esquerda e avan\xE7ar para a pr\xF3xima\n" "Copiar para a Esquerda e Avan\xE7ar (Ctrl+Alt+Esquerda)" -#: Merge.rc:2705 +#: Merge.rc:2706 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5705,7 +5709,7 @@ "Copiar todas as diferen\xE7as para o arquivo da direita\n" "Tudo para a Direita" -#: Merge.rc:2706 +#: Merge.rc:2707 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5714,77 +5718,77 @@ "Copiar todas as diferen\xE7as para o arquivo da esquerda\n" "Tudo para a Esquerda" -#: Merge.rc:2707 +#: Merge.rc:2708 #, c-format msgid "Delete selected items from both directories" msgstr "Apagar os itens selecionados de ambos os diret\xF3rios" -#: Merge.rc:2708 +#: Merge.rc:2709 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparar o item selecionado (comparar o primeiro item se m\xFAltiplos itens est\xE3o selecionados)" -#: Merge.rc:2714 +#: Merge.rc:2715 #, c-format msgid "Select and reorder directory compare columns" msgstr "Selecionar e re-ordenar as colunas de compara\xE7\xE3o dos diret\xF3rios" -#: Merge.rc:2715 +#: Merge.rc:2716 #, c-format msgid "Generate a patch-file" msgstr "Gerar um arquivo-patch" -#: Merge.rc:2716 +#: Merge.rc:2717 #, c-format msgid "Select and modify filters" msgstr "Selecionar e modificar os filtros" -#: Merge.rc:2717 +#: Merge.rc:2718 #, c-format msgid "Generates a report from compare results" msgstr "Gera um relat\xF3rio dos resultados da compara\xE7\xE3o" -#: Merge.rc:2723 +#: Merge.rc:2724 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2725 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "O usu\xE1rio seleciona o desempacotador (sem desempacotamento quando comparando diret\xF3rios)" -#: Merge.rc:2725 +#: Merge.rc:2726 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O desempacotador adaptado est\xE1 aplicado a ambos os arquivos (um arquivo s\xF3 precisa da extens\xE3o)" -#: Merge.rc:2726 +#: Merge.rc:2727 #, c-format msgid "Select an unpacker to edit this file" msgstr "Selecione um desempacotador para editar este arquivo" -#: Merge.rc:2727 +#: Merge.rc:2728 #, c-format msgid "No prediffer (normal)" msgstr "Sem prediffer (normal)" -#: Merge.rc:2728 +#: Merge.rc:2729 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2729 +#: Merge.rc:2730 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2730 +#: Merge.rc:2731 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarregar todos os plugins e recarreg\xE1-los (para desenvolvedores)" -#: Merge.rc:2736 +#: Merge.rc:2737 #, c-format msgid "" "Activates next visible file\n" @@ -5793,12 +5797,12 @@ "Ativa o pr\xF3ximo arquivo vis\xEDvel\n" "Ativar o pr\xF3ximo arquivo" -#: Merge.rc:2737 +#: Merge.rc:2738 #, c-format msgid "Closes all open windows" msgstr "Fecha todas as janelas abertas" -#: Merge.rc:2743 +#: Merge.rc:2744 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5807,22 +5811,22 @@ "Abre a Ajuda do WinMerge\n" "Ajuda do WinMerge" -#: Merge.rc:2744 +#: Merge.rc:2745 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Emite a info da vers\xE3o atual do WinMerge e configura\xE7\xE3o para o arquivo texto" -#: Merge.rc:2745 +#: Merge.rc:2746 #, c-format msgid "Display the GNU General Public License" msgstr "Exibe a GNU Licen\xE7a para o P\xFAblico em Geral" -#: Merge.rc:2746 +#: Merge.rc:2747 #, c-format msgid "Private Build: %1" msgstr "Build Privado: %1" -#: Merge.rc:2747 +#: Merge.rc:2748 #, c-format msgid "" "Opens the release notes document\n" @@ -5831,7 +5835,7 @@ "Abre o documento das notas do lan\xE7amento\n" "Notas do Lan\xE7amento" -#: Merge.rc:2748 +#: Merge.rc:2749 #, c-format msgid "" "Opens the translations website\n" @@ -5840,262 +5844,267 @@ "Abre o website das tradu\xE7\xF5es\n" "Tradu\xE7\xF5es" -#: Merge.rc:2754 +#: Merge.rc:2755 #, c-format msgid "Plugin Settings" msgstr "Configura\xE7\xF5es dos Plugins" -#: Merge.rc:2755 +#: Merge.rc:2756 #, c-format msgid "No prediffer" msgstr "Sem prediffer" -#: Merge.rc:2756 +#: Merge.rc:2757 #, c-format msgid "Prediff if possible" msgstr "Prediff se poss\xEDvel" -#: Merge.rc:2758 +#: Merge.rc:2759 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH n\xE3o achado - scripts .sct desativados" -#: Merge.rc:2759 +#: Merge.rc:2760 #, c-format msgid "<None>" msgstr "<Nenhum>" -#: Merge.rc:2760 +#: Merge.rc:2761 #, c-format msgid "<Automatic>" msgstr "<Autom\xE1tico>" -#: Merge.rc:2766 +#: Merge.rc:2767 #, c-format msgid "Open the file with registered application" msgstr "Abrir o arquivo com o aplicativo registrado" -#: Merge.rc:2767 +#: Merge.rc:2768 #, c-format msgid "Open the file with external editor" msgstr "Abrir o arquivo com o editor externo" -#: Merge.rc:2768 +#: Merge.rc:2769 #, c-format msgid "Open the file with a particular program" msgstr "Abrir o arquivo com um programa particular" -#: Merge.rc:2774 +#: Merge.rc:2775 #, c-format msgid "Do not display moved blocks" msgstr "N\xE3o exibir os blocos movidos" -#: Merge.rc:2775 +#: Merge.rc:2776 #, c-format msgid "Display all moved blocks" msgstr "Exibir todos os blocos movidos" -#: Merge.rc:2776 +#: Merge.rc:2777 #, c-format msgid "Display moved blocks only from current diff" msgstr "Exibir os blocos movidos apenas da diferen\xE7a atual" -#: Merge.rc:2777 +#: Merge.rc:2778 #, c-format msgid "Go to diff under cursor" msgstr "Ir para a diferen\xE7a sob o cursor" -#: Merge.rc:2778 +#: Merge.rc:2779 #, c-format msgid "G&oto Diff %1 of %2" msgstr "I&ir para a Diferen\xE7a %1 de %2" -#: Merge.rc:2779 +#: Merge.rc:2780 #, c-format msgid "G&oto Line %1" msgstr "I&r para a Linha %1" -#: Merge.rc:2785 +#: Merge.rc:2786 #, c-format msgid "Disabled" msgstr "Desativado" -#: Merge.rc:2786 +#: Merge.rc:2787 #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:2787 +#: Merge.rc:2788 #, c-format msgid "From MRU list" msgstr "Da lista da MRU" #: Merge.rc:2794 #, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2795 +#, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2795 +#: Merge.rc:2796 #, c-format msgid "Basic" msgstr "B\xE1sico" -#: Merge.rc:2796 +#: Merge.rc:2797 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2797 +#: Merge.rc:2798 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2798 +#: Merge.rc:2799 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2799 +#: Merge.rc:2800 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2800 +#: Merge.rc:2801 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2801 +#: Merge.rc:2802 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2802 +#: Merge.rc:2803 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2803 +#: Merge.rc:2804 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2804 +#: Merge.rc:2805 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2805 +#: Merge.rc:2806 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2806 +#: Merge.rc:2807 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2807 +#: Merge.rc:2808 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2808 +#: Merge.rc:2809 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2809 +#: Merge.rc:2810 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2810 +#: Merge.rc:2811 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2811 +#: Merge.rc:2812 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2812 +#: Merge.rc:2813 #, c-format msgid "Portable Object" msgstr "Objeto Port\xE1til" -#: Merge.rc:2813 +#: Merge.rc:2814 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2814 +#: Merge.rc:2815 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2815 +#: Merge.rc:2816 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2816 +#: Merge.rc:2817 #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:2817 +#: Merge.rc:2818 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2818 +#: Merge.rc:2819 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2819 +#: Merge.rc:2820 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2820 +#: Merge.rc:2821 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2821 +#: Merge.rc:2822 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2822 +#: Merge.rc:2823 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2823 +#: Merge.rc:2824 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2824 +#: Merge.rc:2825 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2829 +#: Merge.rc:2830 #, c-format msgid "Hide the toolbar" msgstr "Esconder a barra de ferramentas" -#: Merge.rc:2830 +#: Merge.rc:2831 #, c-format msgid "Show small toolbar" msgstr "Mostrar barra de ferramentas pequena" -#: Merge.rc:2831 +#: Merge.rc:2832 #, c-format msgid "Show big toolbar" msgstr "Mostrar barra de ferramentas grande" Modified: trunk/Src/Languages/Bulgarian.po =================================================================== --- trunk/Src/Languages/Bulgarian.po 2008-08-04 14:08:25 UTC (rev 5731) +++ trunk/Src/Languages/Bulgarian.po 2008-08-04 14:10:59 UTC (rev 5732) @@ -720,7 +720,7 @@ msgstr "&\xD1\xEA\xF0\xE8\xEF\xF2\xEE\xE2\xE5" #: Merge.rc:370 -#: Merge.rc:2757 +#: Merge.rc:2758 #, c-format msgid "< Empty >" msgstr "< \xCF\xF0\xE0\xE7\xE5\xED >" @@ -2341,7 +2341,7 @@ msgstr "\xD4\xE0\xE9\xEB\xE0:" #: Merge.rc:1480 -#: Merge.rc:2315 +#: Merge.rc:2316 #, c-format msgid "Different" msgstr "\xD0\xE0\xE7\xEB\xE8\xF7\xED\xE8" @@ -3333,7 +3333,7 @@ msgstr "\xD0\xE0\xE7\xEC\xE5\xF0" #: Merge.rc:2013 -#: Merge.rc:2621 +#: Merge.rc:2622 #, c-format msgid "Name" msgstr "\xC8\xEC\xE5" @@ -3354,7 +3354,7 @@ msgstr "" #: Merge.rc:2017 -#: Merge.rc:2623 +#: Merge.rc:2624 #, c-format msgid "Description" msgstr "\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5" @@ -3865,8 +3865,7 @@ " \xCC\xEE\xEB\xFF, \xEF\xF0\xEE\xE2\xE5\xF0\xE5\xF2\xE5 \xEA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF\xF2\xE0 \xED\xE0 \xE8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xED\xE8\xFF \xE8\xE7\xE3\xEB\xE5\xE4." #: Merge.rc:2166 -#: Merge.rc:2605 -#: Merge.rc:2793 +#: Merge.rc:2606 #, c-format msgid "None" msgstr "\xCD\xFF\xEC\xE0" @@ -4298,7 +4297,7 @@ msgstr "\xD0\xE0\xE7\xEB\xE8\xEA\xE8" #: Merge.rc:2297 -#: Merge.rc:2601 +#: Merge.rc:2602 #, c-format msgid "Binary" msgstr "\xC4\xE2\xEE\xE8\xF7\xE5\xED" @@ -4350,190 +4349,195 @@ #: Merge.rc:2313 #, c-format +msgid "Folders are different" +msgstr "" + +#: Merge.rc:2314 +#, c-format msgid "Left Only" msgstr "\xD1\xE0\xEC\xEE \xEB\xE5\xE2\xE8\xFF\xF2" -#: Merge.rc:2314 +#: Merge.rc:2315 #, c-format msgid "Right Only" msgstr "\xD1\xE0\xEC\xEE \xE4\xE5\xF1\xED\xE8\xFF\xF2" -#: Merge.rc:2316 +#: Merge.rc:2317 #, c-format msgid "Error" msgstr "\xC3\xF0\xE5\xF8\xEA\xE0" -#: Merge.rc:2322 +#: Merge.rc:2323 #, c-format msgid "Elapsed time: %ld ms" msgstr "\xCE\xF1\xF2\xE0\xE2\xE0\xF9\xEE \xE2\xF0\xE5\xEC\xE5: %ld ms" -#: Merge.rc:2323 +#: Merge.rc:2324 #, c-format msgid "1 item selected" msgstr "1 \xE8\xE7\xE1\xF0\xE0\xED \xEE\xE1\xE5\xEA\xF2" -#: Merge.rc:2324 +#: Merge.rc:2325 #, c-format msgid "%1 items selected" msgstr "%1 \xE8\xE7\xE1\xF0\xE0\xED\xE8 \xEE\xE1\xE5\xEA\xF2\xE0" -#: Merge.rc:2330 +#: Merge.rc:2331 #, c-format msgid "Filename or folder name." msgstr "\xC8\xEC\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xE8\xEB\xE8 \xF4\xE0\xE9\xEB\xE0." -#: Merge.rc:2331 +#: Merge.rc:2332 #, c-format msgid "Subfolder name when subfolders are included." msgstr "\xC8\xEC\xE5 \xED\xE0 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE0\xF2\xE0, \xEA\xEE\xE3\xE0\xF2\xEE \xF1\xE0 \xE2\xEA\xEB\xFE\xF7\xE5\xED\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8\xF2\xE5." -#: Merge.rc:2332 +#: Merge.rc:2333 #, c-format msgid "Comparison result, long form." msgstr "\xD0\xE5\xE7\xF3\xEB\xF2\xE0\xF2 \xED\xE0 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5\xF2\xEE, \xE4\xFA\xEB\xE3\xE0 \xF4\xEE\xF0\xEC\xE0." -#: Merge.rc:2333 +#: Merge.rc:2334 #, c-format msgid "Left side modification date." msgstr "\xC4\xE0\xF2\xE0 \xED\xE0 \xEF\xF0\xEE\xEC\xFF\xED\xE0 \xED\xE0 \xEB\xFF\xE2\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2334 +#: Merge.rc:2335 #, c-format msgid "Right side modification date." msgstr "\xC4\xE0\xF2\xE0 \xED\xE0 \xEF\xF0\xEE\xEC\xFF\xED\xE0 \xED\xE0 \xE4\xFF\xF1\xED\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2335 +#: Merge.rc:2336 #, c-format msgid "File's extension." msgstr "\xD0\xE0\xE7\xF8\xE8\xF0\xE5\xED\xE8\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0." -#: Merge.rc:2336 +#: Merge.rc:2337 #, c-format msgid "Left file size in bytes." msgstr "\xD0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xEB\xE5\xE2\xE8\xFF \xF4\xE0\xE9\xEB \xE2 \xE1\xE0\xE9\xF2\xE0." -#: Merge.rc:2337 +#: Merge.rc:2338 #, c-format msgid "Right file size in bytes." msgstr "\xD0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xE4\xE5\xF1\xED\xE8\xFF \xF4\xE0\xE9\xEB \xE2 \xE1\xE0\xE9\xF2\xE0." -#: Merge.rc:2338 +#: Merge.rc:2339 #, c-format msgid "Left file size abbreviated." msgstr "\xD1\xFA\xEA\xF0\xE0\xF2\xE5\xED \xF0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xE2 \xEB\xFF\xE2\xEE." -#: Merge.rc:2339 +#: Merge.rc:2340 #, c-format msgid "Right file size abbreviated." msgstr "\xD1\xFA\xEA\xF0\xE0\xF2\xE5\xED \xF0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xE2 \xE4\xFF\xF1\xED\xEE." -#: Merge.rc:2345 +#: Merge.rc:2346 #, c-format msgid "Left side creation time." msgstr "\xC4\xE0\xF2\xE0 \xED\xE0 \xF1\xFA\xE7\xE4\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xEB\xFF\xE2\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2346 +#: Merge.rc:2347 #, c-format msgid "Right side creation time." msgstr "\xC4\xE0\xF2\xE0 \xED\xE0 \xF1\xFA\xE7\xE4\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xE4\xFF\xF1\xED\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2347 +#: Merge.rc:2348 #, c-format msgid "Tells which side has newer modification date." msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xEA\xEE\xFF \xF1\xF2\xF0\xE0\xED\xE0 \xE8\xEC\xE0 \xEF\xEE-\xED\xEE\xE2\xE0 \xE4\xE0\xF2\xE0 \xED\xE0 \xEF\xF0\xEE\xEC\xFF\xED\xE0." -#: Merge.rc:2348 +#: Merge.rc:2349 #, c-format msgid "Left side file version, only for some filetypes." msgstr "\xC2\xE5\xF0\xF1\xE8\xFF \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xEE\xF2 \xEB\xFF\xE2\xEE, \xF1\xE0\xEC\xEE \xE7\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xEE\xF2 \xE5\xE4\xED\xE0\xEA\xFA\xE2 \xF2\xE8\xEF." -#: Merge.rc:2349 +#: Merge.rc:2350 #, c-format msgid "Right side file version, only for some filetypes." msgstr "\xC2\xE5\xF0\xF1\xE8\xFF \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xEE\xF2 \xE4\xFF\xF1\xED\xEE, \xF1\xE0\xEC\xEE \xE7\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xEE\xF2 \xE5\xE4\xED\xE0\xEA\xFA\xE2 \xF2\xE8\xEF." -#: Merge.rc:2350 +#: Merge.rc:2351 #, c-format msgid "Short comparison result." msgstr "\xCA\xF0\xE0\xF2\xEA\xE8 \xF0\xE5\xE7\xF3\xEB\xF2\xE0\xF2\xE8 \xED\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5." -#: Merge.rc:2351 +#: Merge.rc:2352 #, c-format msgid "Left side attributes." msgstr "\xC0\xF2\xF0\xE8\xE1\xF3\xF2\xE8 \xED\xE0 \xEB\xFF\xE2\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2352 +#: Merge.rc:2353 #, c-format msgid "Right side attributes." msgstr "\xC0\xF2\xF0\xE8\xE1\xF3\xF2\xE8 \xED\xE0 \xE4\xFF\xF1\xED\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2353 +#: Merge.rc:2354 #, c-format msgid "Left side file EOL type" msgstr "EOL \xF2\xE8\xEF \xED\xE0 \xEB\xE5\xE2\xE8\xFF \xF4\xE0\xE9\xEB" -#: Merge.rc:2354 +#: Merge.rc:2355 #, c-format msgid "Right side file EOL type" msgstr "EOL \xF2\xE8\xEF \xED\xE0 \xE4\xE5\xF1\xED\xE8\xFF \xF4\xE0\xE9\xEB" -#: Merge.rc:2360 +#: Merge.rc:2361 #, c-format msgid "Left side encoding." msgstr "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xED\xE0 \xEB\xFF\xE2\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2361 +#: Merge.rc:2362 #, c-format msgid "Right side encoding." msgstr "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xED\xE0 \xE4\xFF\xF1\xED\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2362 +#: Merge.rc:2363 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "\xC1\xF0\xEE\xE9 \xED\xE0 \xE8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xED\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xE2\xFA\xE2 \xF4\xE0\xE9\xEB. \xD2\xE5\xE7\xE8 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xF1\xE0 \xE8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xED\xE8 \xEE\xF2 WinMerge \xE8 \xED\xE5 \xEC\xEE\xE3\xE0\xF2 \xE4\xE0 \xE1\xFA\xE4\xE0\xF2 \xF1\xEC\xE5\xF1\xE5\xED\xE8." -#: Merge.rc:2363 +#: Merge.rc:2364 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "\xC1\xF0\xEE\xE9 \xED\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2\xFA\xE2 \xF4\xE0\xE9\xEB. \xD2\xEE\xE7\xE8 \xE1\xF0\xEE\xE9 \xED\xE5 \xE2\xEA\xEB\xFE\xF7\xE2\xE0 \xE8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xED\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8." -#: Merge.rc:2364 +#: Merge.rc:2365 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "\xCF\xEE\xEA\xE0\xE6\xE8 \xE7\xE2\xE5\xE7\xE4\xE8\xF7\xEA\xE0 (*), \xE0\xEA\xEE \xF4\xE0\xE9\xEB\xFA\xF2 \xE5 \xE4\xE2\xEE\xE8\xF7\xE5\xED." -#: Merge.rc:2370 +#: Merge.rc:2371 #, c-format msgid "Compare %1 with %2" msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 %1 \xF1 %2" -#: Merge.rc:2371 +#: Merge.rc:2372 #, c-format msgid "Comma-separated list" msgstr "\xD1\xEF\xE8\xF1\xFA\xEA, \xF0\xE0\xE7\xE4\xE5\xEB\xE5\xED \xF1\xFA\xF1 \xE7\xE0\xEF\xE5\xF2\xE0\xFF" -#: Merge.rc:2372 +#: Merge.rc:2373 #, c-format msgid "Tab-separated list" msgstr "\xD1\xEF\xE8\xF1\xFA\xEA, \xF0\xE0\xE7\xE4\xE5\xEB\xE5\xED \xF1 \xF2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF" -#: Merge.rc:2373 +#: Merge.rc:2374 #, c-format msgid "Simple HTML" msgstr "\xD7\xE8\xF1\xF2 HTML" -#: Merge.rc:2374 +#: Merge.rc:2375 #, c-format msgid "Simple XML" msgstr "\xD7\xE8\xF1\xF2 XML" -#: Merge.rc:2376 +#: Merge.rc:2377 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "\xD4\xE0\xE9\xEB\xFA\xF2 \xF1 \xEE\xF2\xF7\xE5\xF2\xE0 \xE2\xE5\xF7\xE5 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0. \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xE7\xE0\xEC\xE5\xED\xE8\xF2\xE5 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9\xE8\xFF \xF4\xE0\xE9\xEB?" -#: Merge.rc:2377 +#: Merge.rc:2378 #, c-format msgid "" "Error creating the report:\n" @@ -4542,32 +4546,32 @@ "\xC3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xF1\xFA\xE7\xE4\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xEE\xF2\xF7\xE5\xF2\xE0:\n" "%1" -#: Merge.rc:2378 +#: Merge.rc:2379 #, c-format msgid "The report has been created successfully." msgstr "\xCE\xF2\xF7\xE5\xF2\xFA\xF2 \xE1\xE5\xF8\xE5 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xED \xF3\xF1\xEF\xE5\xF8\xED\xEE." -#: Merge.rc:2384 +#: Merge.rc:2385 #, c-format msgid "The same file is opened in both panels." msgstr "\xC5\xE4\xED\xE0\xEA\xE2\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xEE\xF2\xE2\xEE\xF0\xE5\xED\xE8 \xE2 \xE4\xE2\xE0\xF2\xE0 \xEF\xE0\xED\xE5\xEB\xE0." -#: Merge.rc:2385 +#: Merge.rc:2386 #, c-format msgid "The selected files are identical." msgstr "\xC8\xE7\xE1\xF0\xE0\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xE5\xE4\xED\xE0\xEA\xE2\xE8." -#: Merge.rc:2386 +#: Merge.rc:2387 #, c-format msgid "An error occurred while comparing the files." msgstr "\xCF\xEE\xEB\xF3\xF7\xE8 \xF1\xE5 \xE3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5\xF2\xE5." -#: Merge.rc:2387 +#: Merge.rc:2388 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "\xCD\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xF1\xFA\xE7\xE4\xE0\xE4\xE0\xF2 \xE2\xF0\xE5\xEC\xE5\xED\xED\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5. \xCF\xF0\xEE\xE2\xE5\xF0\xE5\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5 \xE7\xE0 \xE2\xF0\xE5\xEC\xE5\xED\xED\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5." -#: Merge.rc:2388 +#: Merge.rc:2389 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4582,32 +4586,32 @@ "\n" "\xC1\xE5\xEB\xE5\xE6\xEA\xE0: \xC0\xEA\xEE \xE8\xF1\xEA\xE0\xF2\xE5 \xE4\xE0 \xF1\xF7\xE8\xF2\xE0\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xE2\xFA\xF0\xED\xE0\xF2\xE8 \xF2\xE8\xEF\xEE\xE2\xE5 \xEA\xE0\xF2\xEE \xE5\xE4\xED\xE0\xEA\xE2\xE8, \xE7\xE0\xE4\xE0\xE9\xF2\xE5 \xEE\xEF\xF6\xE8\xFF\xF2\xE0 '\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xE2\xFA\xF0\xED\xE0\xF2\xE8 \xF2\xE8\xEF\xEE\xE2\xE5..' \xE2 \xF0\xE0\xE7\xE4\xE5\xEB\xE0 \xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xEE\xF2 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0 \xF1 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5 (\xED\xE0\xEC\xE8\xF0\xE0 \xF1\xE5 \xEE\xF2 \xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xED\xE5/\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8)." -#: Merge.rc:2389 +#: Merge.rc:2390 #, c-format msgid "The EOL are of different types (Windows/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 "\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?" -#: Merge.rc:2390 +#: Merge.rc:2391 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "\xC2\xFA\xE7\xED\xE8\xEA\xED\xE0 \xE3\xF0\xE5\xF8\xEA\xE0 \xE4\xEE\xEA\xE0\xF2\xEE \xF1\xE5 \xEF\xF0\xEE\xE2\xE5\xF0\xFF\xE2\xE0\xF8\xE5 \xE7\xE0 \xEF\xF0\xE5\xE4\xE2\xE0\xF0\xE8\xF2\xE5\xEB\xED\xE8 \xE3\xF0\xE5\xF8\xEA\xE8 \xF4\xE0\xE9\xEB\xFA\xF2 '%1' \xF1 \xE4\xEE\xE1\xE0\xE2\xEA\xE0\xF2\xE0 '%2'. \xCF\xF0\xE5\xE4\xE2\xE0\xF0\xE8\xF2\xE5\xEB\xED\xEE\xF2\xEE \xEF\xF0\xEE\xE2\xE5\xF0\xFF\xE2\xE0\xED\xE5 \xE7\xE0 \xE3\xF0\xE5\xF8\xEA\xE8 \xED\xE5 \xF1\xE5 \xEF\xF0\xE8\xEB\xE0\xE3\xE0 \xE2\xE5\xF7\xE5." -#: Merge.rc:2391 +#: Merge.rc:2392 #, c-format msgid "The selected folder is invalid." msgstr "\xC8\xE7\xE1\xF0\xE0\xED\xE0\xF2\xE0 \xEF\xE0\xEF\xEA\xE0 \xE5 \xED\xE5\xE2\xE0\xEB\xE8\xE4\xED\xE0." -#: Merge.rc:2392 +#: Merge.rc:2393 #, c-format msgid "Cannot open a binary file to editor." msgstr "\xCD\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8 \xE4\xE2\xEE\xE8\xF7\xE5\xED \xF4\xE0\xE9\xEB \xF1 \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0." -#: Merge.rc:2393 +#: Merge.rc:2394 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n\n\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n%1\n\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?" -#: Merge.rc:2399 +#: Merge.rc:2400 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4618,132 +4622,132 @@ "\xCF\xEE\xEA\xE0\xE7\xE2\xE0\xED\xE5\xF2\xEE \xED\xE0 \xE2\xF1\xE5\xEA\xE8 \xF4\xE0\xE9\xEB \xF1 \xED\xE5\xE3\xEE\xE2\xE0\xF2\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xF9\xE5 \xE4\xE0\xE4\xE5 \xEF\xEE-\xE4\xEE\xE1\xF0\xE0 \xE2\xE8\xE4\xE8\xEC\xEE\xF1\xF2, \xED\xEE \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5\xF2\xEE \xE8\xEB\xE8 \xEA\xEE\xEF\xE8\xF0\xE0\xED\xE5\xF2\xEE \xF9\xE5 \xE5 \xEE\xEF\xE0\xF1\xED\xEE.\n" "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5\xF2\xE5 \xE4\xE0 \xF1\xE5 \xEE\xE1\xF0\xE0\xE1\xEE\xF2\xE2\xE0\xF2, \xE8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9\xEA\xE8 \xE7\xE0\xE4\xE0\xE4\xE5\xED\xE0\xF2\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xED\xE0 Windows (\xEF\xF0\xE5\xEF\xEE\xF0\xFA\xF7\xE8\xF2\xE5\xEB\xED\xEE)?" -#: Merge.rc:2400 +#: Merge.rc:2401 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "\xC2\xED\xE8\xEC\xE0\xED\xE8\xE5: \xD4\xE0\xE9\xEB\xEE\xE2\xE5\xF2\xE5 \xE8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0, \xEB\xFF\xE2=%s \xE8 \xE4\xE5\xF1\xE5\xED=%s, \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5\xF2\xEE \xEC\xEE\xE6\xE5 \xE4\xE0 \xE4\xEE\xE2\xE5\xE4\xE5 \xE4\xEE \xE7\xE0\xE3\xF3\xE1\xE0 \xED\xE0 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF." -#: Merge.rc:2401 +#: Merge.rc:2402 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "\xC7\xE0\xE3\xF3\xE1\xE0 \xED\xE0 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF, \xEF\xEE\xF0\xE0\xE4\xE8 \xE3\xF0\xE5\xF8\xEA\xE0 \xE2 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0\xF2\xE0 \xED\xE0: \... [truncated message content] |
From: <ki...@us...> - 2008-08-21 15:32:51
|
Revision: 5845 http://winmerge.svn.sourceforge.net/winmerge/?rev=5845&view=rev Author: kimmov Date: 2008-08-21 15:32:47 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Synchronize English.pot and PO files with the merge.rc file. Modified Paths: -------------- trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/English.pot trunk/Src/Languages/French.po trunk/Src/Languages/German.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Japanese.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po trunk/Src/Languages/Ukrainian.po Modified: trunk/Src/Languages/Bulgarian.po =================================================================== --- trunk/Src/Languages/Bulgarian.po 2008-08-21 15:26:44 UTC (rev 5844) +++ trunk/Src/Languages/Bulgarian.po 2008-08-21 15:32:47 UTC (rev 5845) @@ -72,7 +72,7 @@ #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "&Copy" msgstr "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9" @@ -84,7 +84,7 @@ msgstr "\xCF\xEE&\xF1\xF2\xE0\xE2\xE8" #: Merge.rc:84 -#: Merge.rc:589 +#: Merge.rc:590 #, c-format msgid "&Goto..." msgstr "\xCE\xF2\xE8\xE4\xE8 &\xED\xE0..." @@ -95,22 +95,22 @@ msgstr "&\xCE\xF2\xE2\xEE\xF0\xE8" #: Merge.rc:88 -#: Merge.rc:531 -#: Merge.rc:537 +#: Merge.rc:532 +#: Merge.rc:538 #, c-format msgid "with &Registered Application" msgstr "\xF1 &\xD0\xE5\xE3\xE8\xF1\xF2\xF0\xE8\xF0\xE0\xED\xEE \xCF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xE5" #: Merge.rc:89 -#: Merge.rc:532 -#: Merge.rc:538 +#: Merge.rc:533 +#: Merge.rc:539 #, c-format msgid "with &External Editor" msgstr "\xF1 &\xC2\xFA\xED\xF8\xE5\xED \xD0\xE5\xE4\xE0\xEA\xF2\xEE\xF0" #: Merge.rc:90 -#: Merge.rc:533 -#: Merge.rc:539 +#: Merge.rc:534 +#: Merge.rc:540 #, c-format msgid "&with..." msgstr "&\xF1\xFA\xF1..." @@ -389,7 +389,7 @@ #: Merge.rc:175 #: Merge.rc:296 #: Merge.rc:484 -#: Merge.rc:1920 +#: Merge.rc:1921 #, c-format msgid "&Help" msgstr "&\xCF\xEE\xEC\xEE\xF9" @@ -591,7 +591,7 @@ msgstr "&\xC8\xE7\xF2\xF0\xE8\xE9\tDel" #: Merge.rc:264 -#: Merge.rc:562 +#: Merge.rc:563 #, c-format msgid "&Customize Columns..." msgstr "&\xCD\xE0\xE3\xEB\xE0\xF1\xE8 \xEA\xEE\xEB\xEE\xED\xE8\xF2\xE5..." @@ -720,7 +720,7 @@ msgstr "&\xD1\xEA\xF0\xE8\xEF\xF2\xEE\xE2\xE5" #: Merge.rc:370 -#: Merge.rc:2758 +#: Merge.rc:2761 #, c-format msgid "< Empty >" msgstr "< \xCF\xF0\xE0\xE7\xE5\xED >" @@ -876,1166 +876,1171 @@ msgid "&XML" msgstr "&XML" -#: Merge.rc:510 +#: Merge.rc:506 #, c-format +msgid "&HEX" +msgstr "" + +#: Merge.rc:511 +#, c-format msgid "&Left to Right" msgstr "\xCE\xF2 &\xEB\xFF\xE2\xEE \xEA\xFA\xEC \xE4\xFF\xF1\xED\xEE" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "L&eft to..." msgstr "\xCE\xF2 \xEB\xFF\xE2&\xEE \xEA\xFA\xEC..." -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "&Right to Left" msgstr "\xCE\xF2 &\xE4\xFF\xF1\xED\xEE \xEA\xFA\xEC \xEB\xFF\xE2\xEE" -#: Merge.rc:513 +#: Merge.rc:514 #, c-format msgid "R&ight to..." msgstr "\xCE\xF2 \xE4&\xFF\xF1\xED\xEE \xEA\xFA\xEC..." -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "&Move" msgstr "&\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "&Left to..." msgstr "\xCE\xF2 &\xEB\xFF\xE2\xEE \xEA\xFA\xEC..." -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "&Right to..." msgstr "\xCE\xF2 &\xE4\xFF\xF1\xED\xEE \xEA\xFA\xEC..." -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "&Delete" msgstr "&\xC8\xE7\xF2\xF0\xE8\xE9" -#: Merge.rc:522 -#: Merge.rc:1140 -#: Merge.rc:1522 +#: Merge.rc:523 +#: Merge.rc:1141 +#: Merge.rc:1523 #, c-format msgid "&Left" msgstr "&\xCE\xF2 \xEB\xFF\xE2\xEE" -#: Merge.rc:523 -#: Merge.rc:1142 -#: Merge.rc:1525 +#: Merge.rc:524 +#: Merge.rc:1143 +#: Merge.rc:1526 #, c-format msgid "&Right" msgstr "&\xCE\xF2 \xE4\xFF\xF1\xED\xEE" -#: Merge.rc:524 +#: Merge.rc:525 #, c-format msgid "&Both" msgstr "&\xC4\xE2\xE5\xF2\xE5" -#: Merge.rc:526 +#: Merge.rc:527 #, c-format msgid "Re&name" msgstr "&\xCF\xF0\xE5\xE8\xEC\xE5\xED\xF3\xE2\xE0\xE9" -#: Merge.rc:527 +#: Merge.rc:528 #, c-format msgid "&Hide Items" msgstr "&\xD1\xEA\xF0\xE8\xE9" -#: Merge.rc:529 +#: Merge.rc:530 #, c-format msgid "&Open Left" msgstr "&\xCE\xF2\xE2\xEE\xF0\xE8 \xE2 \xEB\xFF\xE2\xEE" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "O&pen Right" msgstr "\xCE&\xF2\xE2\xEE\xF0\xE8 \xE2 \xE4\xFF\xF1\xED\xEE" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Cop&y Pathnames" msgstr "\xCA\xEE\xEF\xE8\xF0\xE0\xE9 &\xEF\xFA\xF2\xFF" -#: Merge.rc:544 +#: Merge.rc:545 #, c-format msgid "&Left (%1 of %2)" msgstr "&\xCB\xFF\xE2\xEE (%1 \xEE\xF2 %2)" -#: Merge.rc:545 +#: Merge.rc:546 #, c-format msgid "&Right (%1 of %2)" msgstr "&\xC4\xFF\xF1\xED\xEE (%1 \xEE\xF2 %2)" -#: Merge.rc:546 +#: Merge.rc:547 #, c-format msgid "&Both (%1 of %2)" msgstr "\xC4&\xE2\xE5\xF2\xE5 (%1 \xEE\xF2 %2)" -#: Merge.rc:548 +#: Merge.rc:549 #, c-format msgid "Copy &Filenames" msgstr "\xCA\xEE\xEF\xE8\xF0\xE0\xE9 &\xF4\xE0\xE9\xEB\xEE\xE2\xE8\xF2\xE5 \xE8\xEC\xE5\xED\xE0" -#: Merge.rc:550 +#: Merge.rc:551 #, c-format msgid "&Zip" msgstr "&\xC7\xE8\xEF" -#: Merge.rc:552 +#: Merge.rc:553 #, c-format msgid "&Left... (%1 of %2)" msgstr "&\xCB\xFF\xE2\xEE... (%1 \xEE\xF2 %2)" -#: Merge.rc:553 +#: Merge.rc:554 #, c-format msgid "&Right... (%1 of %2)" msgstr "&\xC4\xFF\xF1\xED\xEE... (%1 \xEE\xF2 %2)" -#: Merge.rc:554 +#: Merge.rc:555 #, c-format msgid "&Both... (%1 of %2)" msgstr "\xC4&\xE2\xE5\xF2\xE5... (%1 \xEE\xF2 %2)" -#: Merge.rc:555 +#: Merge.rc:556 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&\xD0\xE0\xE7\xEB\xE8\xEA\xE8... (%1 \xEE\xF2 %2)" -#: Merge.rc:558 +#: Merge.rc:559 #, c-format msgid "&Refresh" msgstr "&\xCE\xE1\xED\xEE\xE2\xE8" -#: Merge.rc:570 +#: Merge.rc:571 #, c-format msgid "&Copy Full Path" msgstr "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9 \xEF\xFA\xF2\xFF" -#: Merge.rc:571 +#: Merge.rc:572 #, c-format msgid "Copy &Filename" msgstr "\xCA\xEE\xEF\xE8\xF0\xE0\xE9 &\xE8\xEC\xE5\xF2\xEE" -#: Merge.rc:577 +#: Merge.rc:578 #, c-format msgid "Prediffer Settings" msgstr "\xCD\xE0\xEB\xE8\xF7\xED\xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8" -#: Merge.rc:579 +#: Merge.rc:580 #, c-format msgid "&No prediffer" msgstr "&\xC1\xE5\xE7 \xED\xE0\xEB\xE8\xF7\xED\xE8" -#: Merge.rc:580 +#: Merge.rc:581 #, c-format msgid "Auto prediffer" msgstr "&\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xE8" -#: Merge.rc:588 +#: Merge.rc:589 #, c-format msgid "G&oto Diff" msgstr "&\xCE\xF2\xE8\xE4\xE8 \xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0" -#: Merge.rc:591 +#: Merge.rc:592 #, c-format msgid "&No Moved Blocks" msgstr "&\xC1\xE5\xE7 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE5\xED\xE8 \xE1\xEB\xEE\xEA\xEE\xE2\xE5" -#: Merge.rc:592 +#: Merge.rc:593 #, c-format msgid "&All Moved Blocks" msgstr "&\xC2\xF1\xE8\xF7\xEA\xE8 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE5\xED\xE8 \xE1\xEB\xEE\xEA\xEE\xE2\xE5" -#: Merge.rc:593 +#: Merge.rc:594 #, c-format msgid "Moved Block for &Current Diff" msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE5\xED \xE1\xEB\xEE\xEA \xE7\xE0 &\xF2\xE5\xEA\xF3\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0" -#: Merge.rc:662 +#: Merge.rc:663 #, c-format msgid "About WinMerge" msgstr "\xC7\xE0 WinMerge" -#: Merge.rc:668 +#: Merge.rc:669 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:669 +#: Merge.rc:670 #, c-format msgid "All rights reserved." msgstr "\xC2\xF1\xE8\xF7\xEA\xE8 \xEF\xF0\xE0\xE2\xE0 \xE7\xE0\xEF\xE0\xE7\xE5\xED\xE8." -#: Merge.rc:670 +#: Merge.rc:671 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "\xCF\xEE\xF1\xE5\xF2\xE8 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xED\xE0 WinMerge!" -#: Merge.rc:673 -#: Merge.rc:705 -#: Merge.rc:795 -#: Merge.rc:981 -#: Merge.rc:1059 -#: Merge.rc:1088 -#: Merge.rc:1098 -#: Merge.rc:1264 -#: Merge.rc:1328 -#: Merge.rc:1341 -#: Merge.rc:1433 -#: Merge.rc:1448 -#: Merge.rc:1670 +#: Merge.rc:674 +#: Merge.rc:706 +#: Merge.rc:796 +#: Merge.rc:982 +#: Merge.rc:1060 +#: Merge.rc:1089 +#: Merge.rc:1099 +#: Merge.rc:1265 +#: Merge.rc:1329 +#: Merge.rc:1342 +#: Merge.rc:1434 +#: Merge.rc:1449 +#: Merge.rc:1671 #, c-format msgid "OK" msgstr "\xCE\xCA" -#: Merge.rc:674 +#: Merge.rc:675 #, c-format msgid "Contributors" msgstr "\xC4\xE0\xF0\xE8\xF2\xE5\xEB\xE8" -#: Merge.rc:681 +#: Merge.rc:682 #, c-format msgid "Select Files or Folders" msgstr "\xC8\xE7\xE1\xE5\xF0\xE8 \xD4\xE0\xE9\xEB \xE8\xEB\xE8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF..." -#: Merge.rc:684 -#: Merge.rc:1599 +#: Merge.rc:685 +#: Merge.rc:1600 #, c-format msgid "&Left:" msgstr "\xCE\xF2 &\xEB\xFF\xE2\xEE:" -#: Merge.rc:688 -#: Merge.rc:749 -#: Merge.rc:1002 -#: Merge.rc:1024 +#: Merge.rc:689 +#: Merge.rc:750 +#: Merge.rc:1003 +#: Merge.rc:1025 #, c-format msgid "&Browse..." msgstr "&\xCF\xEE\xF2\xFA\xF0\xF1\xE8..." -#: Merge.rc:689 -#: Merge.rc:1603 +#: Merge.rc:690 +#: Merge.rc:1604 #, c-format msgid "&Right:" msgstr "\xCE\xF2 &\xE4\xFF\xF1\xED\xEE:" -#: Merge.rc:693 -#: Merge.rc:1035 +#: Merge.rc:694 +#: Merge.rc:1036 #, c-format msgid "Bro&wse..." msgstr "\xCF\xEE&\xF2\xFA\xF0\xF1\xE8..." -#: Merge.rc:694 -#: Merge.rc:1607 +#: Merge.rc:695 +#: Merge.rc:1608 #, c-format msgid "&Filter:" msgstr "&\xD4\xE8\xEB\xF2\xFA\xF0:" -#: Merge.rc:697 -#: Merge.rc:1609 +#: Merge.rc:698 +#: Merge.rc:1610 #, c-format msgid "Select..." msgstr "\xC8\xE7\xE1\xE5\xF0\xE8..." -#: Merge.rc:698 +#: Merge.rc:699 #, c-format msgid "&Unpacker:" msgstr "&\xD0\xE0\xE7\xE0\xF0\xF5\xE8\xE2\xE8\xF2\xEE\xF0:" -#: Merge.rc:701 +#: Merge.rc:702 #, c-format msgid "&Select..." msgstr "\xC8\xE7\xE1\xE5\xF0\xE8..." -#: Merge.rc:702 -#: Merge.rc:1610 +#: Merge.rc:703 +#: Merge.rc:1611 #, c-format msgid "&Include Subfolders" msgstr "&\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xE5\xEB\xED\xEE \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8\xF2\xE5" -#: Merge.rc:704 +#: Merge.rc:705 #, c-format msgid "Status:" msgstr "\xD1\xF2\xE0\xF2\xF3\xF1:" -#: Merge.rc:706 -#: Merge.rc:736 -#: Merge.rc:796 -#: Merge.rc:826 -#: Merge.rc:858 -#: Merge.rc:868 -#: Merge.rc:1060 -#: Merge.rc:1089 -#: Merge.rc:1099 -#: Merge.rc:1150 -#: Merge.rc:1265 -#: Merge.rc:1342 -#: Merge.rc:1434 -#: Merge.rc:1449 -#: Merge.rc:1671 +#: Merge.rc:707 +#: Merge.rc:737 +#: Merge.rc:797 +#: Merge.rc:827 +#: Merge.rc:859 +#: Merge.rc:869 +#: Merge.rc:1061 +#: Merge.rc:1090 +#: Merge.rc:1100 +#: Merge.rc:1151 +#: Merge.rc:1266 +#: Merge.rc:1343 +#: Merge.rc:1435 +#: Merge.rc:1450 +#: Merge.rc:1672 #, c-format msgid "Cancel" msgstr "\xCE\xF2\xEC\xE5\xED\xE8" -#: Merge.rc:707 -#: Merge.rc:1343 +#: Merge.rc:708 +#: Merge.rc:1344 #, c-format msgid "Help" msgstr "\xCF\xEE\xEC\xEE\xF9" -#: Merge.rc:708 +#: Merge.rc:709 #, c-format msgid "Files or Folders to Compare" msgstr "\xD4\xE0\xE9\xEB\xEE\xE2\xE5 \xE8\xEB\xE8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xE8 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5" -#: Merge.rc:715 +#: Merge.rc:716 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:720 +#: Merge.rc:721 #, c-format msgid "Database:" msgstr "\xC1\xE0\xE7\xE0 \xE4\xE0\xED\xED\xE8:" -#: Merge.rc:723 +#: Merge.rc:724 #, c-format msgid "Project:" msgstr "\xCF\xF0\xEE\xE5\xEA\xF2:" -#: Merge.rc:726 +#: Merge.rc:727 #, c-format msgid "User:" msgstr "\xCF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB:" -#: Merge.rc:728 +#: Merge.rc:729 #, c-format msgid "Password:" msgstr "\xCF\xE0\xF0\xEE\xEB\xE0:" -#: Merge.rc:730 +#: Merge.rc:731 #, c-format msgid "Link to Destination VSS project" msgstr "\xC2\xF0\xFA\xE7\xEA\xE0 \xF1 VSS \xEF\xF0\xEE\xE5\xEA\xF2" -#: Merge.rc:732 -#: Merge.rc:873 +#: Merge.rc:733 +#: Merge.rc:874 #, c-format msgid "Apply to all items" msgstr "\xC7\xE0\xE4\xE0\xE9 \xE7\xE0 \xE2\xF1\xE8\xF7\xEA\xE8" -#: Merge.rc:734 +#: Merge.rc:735 #, c-format msgid "Check Out" msgstr "\xC4\xE5\xE9\xF1\xF2\xE2\xE0\xE9" -#: Merge.rc:735 -#: Merge.rc:869 +#: Merge.rc:736 +#: Merge.rc:870 #, c-format msgid "Save As..." msgstr "\xC7\xE0\xEF\xE8\xF8\xE8 \xEA\xE0\xF2\xEE..." -#: Merge.rc:741 +#: Merge.rc:742 #, c-format msgid "Versioning System" msgstr "\xD1\xE8\xF1\xF2\xE5\xEC\xE0 \xE7\xE0 \xE2\xE5\xF0\xF1\xE8\xE8" -#: Merge.rc:744 +#: Merge.rc:745 #, c-format msgid "&Versioning System:" msgstr "\xD1\xE8\xF1\xF2\xE5\xEC\xE0 \xE7\xE0 \xE2\xE5\xF0\xF1\xE8\xE8" -#: Merge.rc:747 +#: Merge.rc:748 #, c-format msgid "&Path to cleartool.exe:" msgstr "&\xCF\xFA\xF2 \xE4\xEE cleartool.exe:" -#: Merge.rc:754 -#: Merge.rc:1928 +#: Merge.rc:755 +#: Merge.rc:1929 #, c-format msgid "General" msgstr "\xCE\xF1\xED\xEE\xE2\xED\xE8" -#: Merge.rc:757 +#: Merge.rc:758 #, c-format msgid "Automatically &scroll to first difference" msgstr "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE &\xEF\xF0\xE8\xE4\xE2\xE8\xE6\xE2\xE0\xED\xE5 \xEA\xFA\xEC \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0" -#: Merge.rc:760 +#: Merge.rc:761 #, c-format msgid "&Disable Splash Screen" msgstr "&\xC7\xE0\xE1\xF0\xE0\xED\xE8 \xED\xE0\xF7\xE0\xEB\xED\xE8\xFF \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6" -#: Merge.rc:762 +#: Merge.rc:763 #, c-format msgid "Cl&ose windows with ESC" msgstr "\xC7\xE0\xF2\xE2\xEE\xF0\xE8 &\xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xEF\xF0\xE8 ESC" -#: Merge.rc:764 +#: Merge.rc:765 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEF\xF0\xEE\xE2\xE5\xF0\xE8 \xEF\xFA\xF2\xE8\xF9\xE0\xF2\xE0 \xE2 \xE4\xE8\xE0\xEB\xEE\xE3\xE0 \xCE\xF2\xE2\xEE\xF0\xE8" -#: Merge.rc:767 +#: Merge.rc:768 #, c-format msgid "All&ow only one instance to run" msgstr "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xF1\xE0\xEC\xEE &\xE5\xE4\xED\xEE \xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xEE \xEA\xEE\xEF\xE8\xE5" -#: Merge.rc:769 +#: Merge.rc:770 #, c-format msgid "As&k when closing multiple windows" msgstr "\xCF\xE8\xF2\xE0\xE9 \xEF\xF0\xE8 \xE7\xE0\xF2\xE2\xE0\xF0\xFF\xED\xE5 \xED\xE0 \xEC\xED\xEE\xE3\xEE \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8" -#: Merge.rc:771 +#: Merge.rc:772 #, c-format msgid "&Preserve file time in file compare" msgstr "\xC7\xE0\xEF\xE0\xE7\xE8 \xE2\xF0\xE5\xEC\xE5\xF2\xEE \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xEF\xF0\xE8 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5" -#: Merge.rc:774 +#: Merge.rc:775 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "\xCE\xF2\xE2\xEE\xF0\xE8-\xE4\xE8\xE0\xEB\xEE\xE3 \xC0\xE2\xF2\xEE-\xE7\xE0\xE2\xFA\xF0\xF8\xE2\xE0\xED\xE5:" -#: Merge.rc:777 +#: Merge.rc:778 #, c-format msgid "Enable multiple compare windows for" msgstr "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xEC\xED\xEE\xE3\xEE \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xE7\xE0" -#: Merge.rc:779 -#: Merge.rc:1622 +#: Merge.rc:780 +#: Merge.rc:1623 #, c-format msgid "&Folder compare" msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 &\xCF\xE0\xEF\xEA\xE8" -#: Merge.rc:781 -#: Merge.rc:1624 +#: Merge.rc:782 +#: Merge.rc:1625 #, c-format msgid "Fil&e compare" msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 &\xD4\xE0\xE9\xEB\xEE\xE2\xE5" -#: Merge.rc:783 +#: Merge.rc:784 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge \xEF\xEE\xE7\xE2\xEE\xEB\xFF\xE2\xE0 \xF1\xEA\xF0\xE8\xE2\xE0\xED\xE5 \xED\xE0 \xED\xFF\xEA\xEE\xE8 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xFF. \xCD\xE0\xF2\xE8\xF1\xED\xE5\xF2\xE5 \xE1\xF3\xF2\xEE\xED\xE0 \xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8, \xE7\xE0 \xE4\xE0 \xEF\xEE\xEA\xE0\xE6\xE5\xF2\xE5 \xEF\xE0\xEA \xF2\xE5\xE7\xE8 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xFF." -#: Merge.rc:785 +#: Merge.rc:786 #, c-format msgid "Reset" msgstr "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8" -#: Merge.rc:792 +#: Merge.rc:793 #, c-format msgid "Language" msgstr "\xC5\xE7\xE8\xEA" -#: Merge.rc:799 +#: Merge.rc:800 #, c-format msgid "Available languages:" msgstr "\xCD\xE0\xEB\xE8\xF7\xED\xE8 \xE5\xE7\xE8\xF6\xE8:" -#: Merge.rc:805 +#: Merge.rc:806 #, c-format msgid "Find" msgstr "\xCD\xE0\xEC\xE5\xF0\xE8" -#: Merge.rc:808 -#: Merge.rc:835 +#: Merge.rc:809 +#: Merge.rc:836 #, c-format msgid "Fi&nd what:" msgstr "&\xD2\xFA\xF0\xF1\xE8 \xE7\xE0:" -#: Merge.rc:811 -#: Merge.rc:841 +#: Merge.rc:812 +#: Merge.rc:842 #, c-format msgid "Match &whole word only" msgstr "\xD2\xFA\xF0\xF1\xE8 &\xF1\xE0\xEC\xEE \xF6\xE5\xEB\xE8 \xE4\xF3\xEC\xE8" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:814 +#: Merge.rc:844 #, c-format msgid "Match &case" msgstr "\xC3\xEB\xE0\xE2\xED\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8" -#: Merge.rc:815 -#: Merge.rc:845 +#: Merge.rc:816 +#: Merge.rc:846 #, c-format msgid "Regular &expression" msgstr "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8 &\xE8\xE7\xF0\xE0\xE7\xE8" -#: Merge.rc:817 +#: Merge.rc:818 #, c-format msgid "D&on't wrap end of file" msgstr "\xC4\xEE \xEA\xF0\xE0\xFF \xED\xE0 \xF4\xE0\xE9\xEB\xE0" -#: Merge.rc:820 +#: Merge.rc:821 #, c-format msgid "Direction" msgstr "\xCF\xEE\xF1\xEE\xEA\xE0" -#: Merge.rc:821 +#: Merge.rc:822 #, c-format msgid "&Up" msgstr "&\xCD\xE0\xE3\xEE\xF0\xE5" -#: Merge.rc:823 +#: Merge.rc:824 #, c-format msgid "&Down" msgstr "\xCD\xE0&\xE4\xEE\xEB\xF3" -#: Merge.rc:825 -#: Merge.rc:855 +#: Merge.rc:826 +#: Merge.rc:856 #, c-format msgid "&Find Next" msgstr "&\xCD\xE0\xEC\xE5\xF0\xE8" -#: Merge.rc:832 +#: Merge.rc:833 #, c-format msgid "Replace" msgstr "\xC7\xE0\xEC\xE5\xED\xE8" -#: Merge.rc:838 +#: Merge.rc:839 #, c-format msgid "Re&place with:" msgstr "&\xC7\xE0\xEC\xE5\xED\xE8 \xF1:" -#: Merge.rc:847 +#: Merge.rc:848 #, c-format msgid "&Don't wrap end of file" msgstr "\xC4\xEE \xEA\xF0\xE0\xFF \xED\xE0 \xF4\xE0\xE9\xEB\xE0" -#: Merge.rc:850 +#: Merge.rc:851 #, c-format msgid "Replace in" msgstr "\xC7\xE0\xEC\xE5\xED\xE8 \xE2" -#: Merge.rc:851 +#: Merge.rc:852 #, c-format msgid "&Selection" msgstr "&\xC8\xE7\xE1\xF0\xE0\xED\xEE\xF2\xEE" -#: Merge.rc:853 +#: Merge.rc:854 #, c-format msgid "Wh&ole file" msgstr "\xC2 &\xF6\xE5\xEB\xE8\xFF \xF4\xE0\xE9\xEB" -#: Merge.rc:856 +#: Merge.rc:857 #, c-format msgid "&Replace" msgstr "&\xC7\xE0\xEC\xE5\xED\xE8" -#: Merge.rc:857 +#: Merge.rc:858 #, c-format msgid "Replace &All" msgstr "\xC7\xE0\xEC. &\xE2\xF1\xE8\xF7\xEA\xEE" -#: Merge.rc:864 -#: Merge.rc:2169 +#: Merge.rc:865 +#: Merge.rc:2172 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:867 +#: Merge.rc:868 #, c-format msgid "CheckOut" msgstr "\xC4\xE5\xE9\xF1\xF2\xE2\xE0\xE9" -#: Merge.rc:872 -#: Merge.rc:1184 +#: Merge.rc:873 +#: Merge.rc:1185 #, c-format msgid "Comments" msgstr "\xCA\xEE\xEC\xE5\xED\xF2\xE0\xF0\xE8" -#: Merge.rc:875 +#: Merge.rc:876 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn \xF1\xEB\xE5\xE4 checkout" -#: Merge.rc:881 +#: Merge.rc:882 #, c-format msgid "Linefilters" msgstr "\xD4\xE8\xEB\xF2\xF0\xE8 \xE7\xE0 \xF0\xE5\xE4" -#: Merge.rc:884 +#: Merge.rc:885 #, c-format msgid "Enable Line Filters" msgstr "\xC2\xEA\xEB\xFE\xF7\xE8 \xF4\xE8\xEB\xF2\xF0\xE8 \xE7\xE0 \xF0\xE5\xE4" -#: Merge.rc:887 +#: Merge.rc:888 #, c-format msgid "Regular Expressions (one per line):" msgstr "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8 \xE8\xE7\xF0\xE0\xE7\xE8 (\xEF\xEE \xE5\xE4\xE8\xED \xED\xE0 \xF0\xE5\xE4):" -#: Merge.rc:894 +#: Merge.rc:895 #, c-format msgid "Save" msgstr "\xC7\xE0\xEF\xE8\xF8\xE8" -#: Merge.rc:895 +#: Merge.rc:896 #, c-format msgid "New" msgstr "\xCD\xEE\xE2" -#: Merge.rc:896 +#: Merge.rc:897 #, c-format msgid "Edit" msgstr "\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xE9" -#: Merge.rc:897 +#: Merge.rc:898 #, c-format msgid "Remove" msgstr "\xCF\xF0\xE5\xEC\xE0\xF5\xED\xE8" -#: Merge.rc:902 -#: Merge.rc:1931 +#: Merge.rc:903 +#: Merge.rc:1932 #, c-format msgid "Colors" msgstr "\xD6\xE2\xE5\xF2\xEE\xE2\xE5" -#: Merge.rc:905 +#: Merge.rc:906 #, c-format msgid "Difference:" msgstr "\xD0\xE0\xE7\xEB\xE8\xEA\xE8:" -#: Merge.rc:909 +#: Merge.rc:910 #, c-format msgid "Selected Difference:" msgstr "\xC8\xE7\xE1\xF0\xE0\xED\xE8 \xF0\xE0\xE7\xEB\xE8\xEA\xE8:" -#: Merge.rc:913 -#: Merge.rc:1574 +#: Merge.rc:914 +#: Merge.rc:1575 #, c-format msgid "Background" msgstr "\xD4\xEE\xED" -#: Merge.rc:914 +#: Merge.rc:915 #, c-format msgid "Deleted" msgstr "\xC8\xE7\xF2\xF0\xE8\xF2\xE8" -#: Merge.rc:927 -#: Merge.rc:1369 -#: Merge.rc:1575 +#: Merge.rc:928 +#: Merge.rc:1370 +#: Merge.rc:1576 #, c-format msgid "Text" msgstr "\xD2\xE5\xEA\xF1\xF2" -#: Merge.rc:931 +#: Merge.rc:932 #, c-format msgid "Ignored Difference:" msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xED\xE8 \xF0\xE0\xE7\xEB\xE8\xEA\xE8:" -#: Merge.rc:941 +#: Merge.rc:942 #, c-format msgid "Moved:" msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE5\xED\xE8:" -#: Merge.rc:951 +#: Merge.rc:952 #, c-format msgid "Selected Moved:" msgstr "\xC8\xE7\xE1\xF0\xE0\xED\xE8 \xE8 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE5\xED\xE8:" -#: Merge.rc:958 +#: Merge.rc:959 #, c-format msgid "Word Difference:" msgstr "\xD0\xE0\xE7\xEB\xE8\xEA\xE8 \xE2 \xE4\xF3\xEC\xE8\xF2\xE5:" -#: Merge.rc:965 +#: Merge.rc:966 #, c-format msgid "Selected Word Diff:" msgstr "\xC2 \xE8\xE7\xE1\xF0\xE0\xED\xE8\xF2\xE5 \xE4\xF3\xEC\xE8:" -#: Merge.rc:972 -#: Merge.rc:1058 -#: Merge.rc:1087 -#: Merge.rc:1187 -#: Merge.rc:1415 +#: Merge.rc:973 +#: Merge.rc:1059 +#: Merge.rc:1088 +#: Merge.rc:1188 +#: Merge.rc:1416 #, c-format msgid "Defaults" msgstr "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8" -#: Merge.rc:978 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:979 +#: Merge.rc:1358 +#: Merge.rc:1564 #, c-format msgid "Dialog" msgstr "\xC4\xE8\xE0\xEB\xEE\xE3" -#: Merge.rc:988 -#: Merge.rc:1934 +#: Merge.rc:989 +#: Merge.rc:1935 #, c-format msgid "System" msgstr "\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE8" -#: Merge.rc:991 +#: Merge.rc:992 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&\xD1\xEB\xEE\xE6\xE8 \xE8\xE7\xF2\xF0\xE8\xF2\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xE2 \xCA\xEE\xF8\xF7\xE5\xF2\xEE" -#: Merge.rc:993 +#: Merge.rc:994 #, c-format msgid "Integration" msgstr "\xC8\xED\xF2\xE5\xE3\xF0\xE0\xF6\xE8\xFF" -#: Merge.rc:994 +#: Merge.rc:995 #, c-format msgid "&Add to explorer context menu" msgstr "&\xC4\xEE\xE1\xE0\xE2\xE8 \xEA\xFA\xEC \xEC\xE5\xED\xFE\xF2\xEE \xED\xE0 \xC5\xEA\xF1\xEF\xEB\xEE\xF0\xE5\xF0\xE0" -#: Merge.rc:996 +#: Merge.rc:997 #, c-format msgid "E&nable advanced menu" msgstr "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 &\xE4\xEE\xEF\xFA\xEB\xED\xE8\xF2\xE5\xEB\xED\xEE \xEC\xE5\xED\xFE" -#: Merge.rc:998 +#: Merge.rc:999 #, c-format msgid "In&clude subfolders by default" msgstr "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xE5\xEB\xED\xEE \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8\xF2\xE5" -#: Merge.rc:1000 +#: Merge.rc:1001 #, c-format msgid "&External editor:" msgstr "&\xC2\xFA\xED\xF8\xE5\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0:" -#: Merge.rc:1003 +#: Merge.rc:1004 #, c-format msgid "&Filter folder:" msgstr "&\xCF\xE0\xEF\xEA\xE0 \xED\xE0 \xF4\xE8\xEB\xF2\xF0\xE8\xF2\xE5:" -#: Merge.rc:1005 +#: Merge.rc:1006 #, c-format msgid "B&rowse..." msgstr "\xCF\xF0\xE5\xE3\xEB\xE5\xE4" -#: Merge.rc:1006 +#: Merge.rc:1007 #, c-format msgid "Temporary files folder" msgstr "\xC2\xF0\xE5\xEC\xE5\xED\xED\xE0 \xEF\xE0\xEF\xEA\xE0" -#: Merge.rc:1007 +#: Merge.rc:1008 #, c-format msgid "S&ystem's temp folder" msgstr "\xC2\xF0\xE5\xEC\xE5\xED\xED\xE0 \xEF\xE0\xEF\xEA\xE0 \xED\xE0 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF2\xE0" -#: Merge.rc:1009 +#: Merge.rc:1010 #, c-format msgid "C&ustom folder:" msgstr "\xC4\xF0\xF3\xE3\xE0 \xEF\xE0\xEF\xEA\xE0" -#: Merge.rc:1012 -#: Merge.rc:1028 +#: Merge.rc:1013 +#: Merge.rc:1029 #, c-format msgid "Br&owse..." msgstr "\xCF&\xEE\xF2\xFA\xF0\xF1\xE8..." -#: Merge.rc:1018 +#: Merge.rc:1019 #, c-format msgid "Patch Generator" msgstr "\xC3\xE5\xED\xE5\xF0\xE8\xF0\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xF7" -#: Merge.rc:1021 +#: Merge.rc:1022 #, c-format msgid "File&1:" msgstr "\xD4\xE0\xE9\xEB&1:" -#: Merge.rc:1025 +#: Merge.rc:1026 #, c-format msgid "File&2:" msgstr "\xD4\xE0\xE9\xEB&2:" -#: Merge.rc:1029 +#: Merge.rc:1030 #, c-format msgid "&Swap" msgstr "&\xD0\xE0\xE7\xEC\xE5\xED\xE8" -#: Merge.rc:1030 +#: Merge.rc:1031 #, c-format msgid "&Append to existing file" msgstr "&\xCF\xF0\xE8\xEB\xEE\xE6\xE8 \xEA\xFA\xEC \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9 \xF4\xE0\xE9\xEB" -#: Merge.rc:1032 +#: Merge.rc:1033 #, c-format msgid "&Result:" msgstr "&\xD0\xE5\xE7\xF3\xEB\xF2\xE0\xF2:" -#: Merge.rc:1036 +#: Merge.rc:1037 #, c-format msgid "&Format" msgstr "&\xD4\xEE\xF0\xEC\xE0\xF2" -#: Merge.rc:1037 +#: Merge.rc:1038 #, c-format msgid "St&yle:" msgstr "\xD1\xF2\xE8&\xEB:" -#: Merge.rc:1040 +#: Merge.rc:1041 #, c-format msgid "&Context:" msgstr "&\xCA\xEE\xED\xF2\xE5\xEA\xF1\xF2:" -#: Merge.rc:1043 +#: Merge.rc:1044 #, c-format msgid "W&hitespaces" msgstr "\xCF\xF0\xE0\xE7\xED&\xE8 \xEC\xE5\xF1\xF2\xE0" -#: Merge.rc:1044 +#: Merge.rc:1045 #, c-format msgid "Com&pare" msgstr "\xD1\xF0\xE0\xE2&\xED\xE8" -#: Merge.rc:1046 +#: Merge.rc:1047 #, c-format msgid "I&gnore changes" msgstr "\xC8&\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5" -#: Merge.rc:1048 +#: Merge.rc:1049 #, c-format msgid "Ig&nore all" msgstr "\xC8\xE3&\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xE2\xF1\xE8\xF7\xEA\xEE" -#: Merge.rc:1050 +#: Merge.rc:1051 #, c-format msgid "Ignor&e blank lines" msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0&\xE9 \xEF\xF0\xE0\xE7\xED\xE8\xF2\xE5 \xEB\xE8\xED\xE8\xE8" -#: Merge.rc:1052 +#: Merge.rc:1053 #, c-format msgid "Case sensi&tive" msgstr "\xC3\xEE\xEB\xE5\xEC\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8" -#: Merge.rc:1054 +#: Merge.rc:1055 #, c-format msgid "Inclu&de command line" msgstr "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xE5\xEB\xED\xEE \xEA\xEE\xEC\xE0\xED\xE4\xED\xE8\xFF \xF0\xE5\xE4" -#: Merge.rc:1056 +#: Merge.rc:1057 #, c-format msgid "Open to e&xternal editor" msgstr "\xCE\xF2\xE2\xEE\xF0\xE8 \xF1 \xE2\xFA\xED\xF8\xE5&\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0" -#: Merge.rc:1078 +#: Merge.rc:1079 #, c-format msgid "Display Columns" msgstr "\xCF\xEE\xEA\xE0\xE6\xE8 \xEA\xEE\xEB\xEE\xED\xE8\xF2\xE5" -#: Merge.rc:1084 +#: Merge.rc:1085 #, c-format msgid "Move &Up" msgstr "\xCD\xE0\xE3\xEE\xF0\xE5" -#: Merge.rc:1085 +#: Merge.rc:1086 #, c-format msgid "Move &Down" msgstr "\xCD\xE0\xE4\xEE\xEB\xF3" -#: Merge.rc:1095 +#: Merge.rc:1096 #, c-format msgid "Select Unpacker" msgstr "\xC8\xE7\xE1\xE5\xF0\xE8 \xF0\xE0\xE7\xE0\xF0\xF5\xE8\xE2\xE0\xF2\xEE\xF0" -#: Merge.rc:1100 +#: Merge.rc:1101 #, c-format msgid "File unpacker:" msgstr "\xD4\xE0\xE9\xEB\xEE\xE2 \xF0\xE0\xE7\xE0\xF0\xF5\xE8\xE2\xE0\xF2\xEE\xF0:" -#: Merge.rc:1103 +#: Merge.rc:1104 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xE2\xF1\xE8\xF7\xEA\xE8 \xF0\xE0\xE7\xE0\xF0\xF5\xE8\xE2\xE0\xF2\xEE\xF0\xE8, \xED\xE5 \xEF\xF0\xEE\xE2\xE5\xF0\xFF\xE2\xE0\xE9 \xF0\xE0\xE7\xF8\xE8\xF0\xE5\xED\xE8\xFF\xF2\xE0" -#: Merge.rc:1106 +#: Merge.rc:1107 #, c-format msgid "Extensions list:" msgstr "\xD1\xEF\xE8\xF1\xFA\xEA \xED\xE0 \xF0\xE0\xE7\xF8\xE8\xF0\xE5\xED\xE8\xFF\xF2\xE0:" -#: Merge.rc:1107 +#: Merge.rc:1108 #, c-format msgid "Description:" msgstr "\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5:" -#: Merge.rc:1118 +#: Merge.rc:1119 #, c-format msgid " Folder Compare Progress" msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8" -#: Merge.rc:1121 -#: Merge.rc:1881 +#: Merge.rc:1122 +#: Merge.rc:1882 #, c-format msgid "Stop" msgstr "\xD1\xEF\xF0\xE8" -#: Merge.rc:1126 +#: Merge.rc:1127 #, c-format msgid "Comparing items..." msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0..." -#: Merge.rc:1127 +#: Merge.rc:1128 #, c-format msgid "Items compared:" msgstr "\xD1\xF0\xE0\xE2\xED\xE5\xED\xE8:" -#: Merge.rc:1128 +#: Merge.rc:1129 #, c-format msgid "Items total:" msgstr "\xC2\xF1\xE8\xF7\xEA\xEE:" -#: Merge.rc:1134 +#: Merge.rc:1135 #, c-format msgid "Go To" msgstr "\xCE\xF2\xE8\xE4\xE8 \xED\xE0" -#: Merge.rc:1137 +#: Merge.rc:1138 #, c-format msgid "G&oto:" msgstr "&\xCE\xF2\xE8\xE4\xE8 \xED\xE0:" -#: Merge.rc:1139 +#: Merge.rc:1140 #, c-format msgid "File" msgstr "\xD4\xE0\xE9\xEB" -#: Merge.rc:1144 +#: Merge.rc:1145 #, c-format msgid "Goto what" msgstr "\xCE\xF2\xE8\xE4\xE8 \xED\xE0:" -#: Merge.rc:1145 +#: Merge.rc:1146 #, c-format msgid "Li&ne" msgstr "\xD0\xE5&\xE4" -#: Merge.rc:1147 +#: Merge.rc:1148 #, c-format msgid "&Difference" msgstr "&\xD0\xE0\xE7\xEB\xE8\xEA\xE0" -#: Merge.rc:1149 +#: Merge.rc:1150 #, c-format msgid "&Go To" msgstr "&\xCE\xF2\xE8\xE4\xE8" -#: Merge.rc:1155 -#: Merge.rc:1929 +#: Merge.rc:1156 +#: Merge.rc:1930 #, c-format msgid "Compare" msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5" -#: Merge.rc:1158 +#: Merge.rc:1159 #, c-format msgid "Whitespace" msgstr "\xCF\xF0\xE0\xE7\xED\xE8 \xEC\xE5\xF1\xF2\xE0" -#: Merge.rc:1159 +#: Merge.rc:1160 #, c-format msgid "&Compare" msgstr "&\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5" -#: Merge.rc:1161 +#: Merge.rc:1162 #, c-format msgid "&Ignore change" msgstr "&\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5" -#: Merge.rc:1163 +#: Merge.rc:1164 #, c-format msgid "I&gnore all" msgstr "\xC8&\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xE2\xF1\xE8\xF7\xEA\xEE" -#: Merge.rc:1165 +#: Merge.rc:1166 #, c-format msgid "Ignore blan&k lines" msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xEF\xF0\xE0&\xE7\xED\xE8\xF2\xE5 \xEB\xE8\xED\xE8\xE8" -#: Merge.rc:1167 +#: Merge.rc:1168 #, c-format msgid "Ignore &case" msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 &\xC3\xEE\xEB\xE5\xEC\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8" -#: Merge.rc:1169 +#: Merge.rc:1170 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1172 +#: Merge.rc:1173 #, c-format msgid "E&nable moved block detection" msgstr "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xF0\xE0\xE7\xEF\xEE\xE7\xED\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE5\xED &\xE1\xEB\xEE\xEA" -#: Merge.rc:1174 +#: Merge.rc:1175 #, c-format msgid "&Match similar lines" msgstr "\xD1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE8\xE5 \xED\xE0 \xEF\xEE\xE4\xEE\xE1\xED\xE8 \xF0\xE5\xE4\xEE\xE2\xE5" -#: Merge.rc:1176 +#: Merge.rc:1177 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xE2\xF0\xE5\xEC\xE5\xE2\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xEF\xEE-\xEC\xE0\xEB\xEA\xE8 \xEE\xF2 3 \xF1\xE5\xEA\xF3\xED\xE4\xE8" -#: Merge.rc:1179 +#: Merge.rc:1180 #, c-format msgid "&File Compare method:" msgstr "\xCC\xE5\xF2\xEE\xE4 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5:" -#: Merge.rc:1182 +#: Merge.rc:1183 #, c-format msgid "S&top after first difference" msgstr "&\xD1\xEF\xF0\xE8 \xF1\xEB\xE5\xE4 \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0" -#: Merge.rc:1185 +#: Merge.rc:1186 #, c-format msgid "Filter Comments" msgstr "\xD4\xE8\xEB\xF2\xFA\xF0 \xE7\xE0 \xEA\xEE\xEC\xE5\xED\xF2\xE0\xF0\xE8" -#: Merge.rc:1192 -#: Merge.rc:1930 +#: Merge.rc:1193 +#: Merge.rc:1931 #, c-format msgid "Editor" msgstr "\xD0\xE5\xE4\xE0\xEA\xF2\xEE\xF0" -#: Merge.rc:1195 +#: Merge.rc:1196 #, c-format msgid "&Highlight syntax" msgstr "&\xCF\xEE\xE4\xF7\xE5\xF0\xF2\xE0\xE2\xE0\xE9 \xF1\xE8\xED\xF2\xE0\xEA\xF1\xE8\xF1\xE0" -#: Merge.rc:1197 +#: Merge.rc:1198 #, c-format msgid "&Automatic rescan" msgstr "&\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xF1\xEA\xE0\xED\xE8\xF0\xE0\xED\xE5" -#: Merge.rc:1199 +#: Merge.rc:1200 #, c-format msgid "&Preserve original EOL chars" msgstr "&\xC7\xE0\xEF\xE0\xE7\xE8 \xEE\xF0\xE8\xE3\xE8\xED\xE0\xEB\xED\xE8\xF2\xE5 EOL \xE2\xE8\xF4\xFA\xF0" -#: Merge.rc:1201 +#: Merge.rc:1202 #, c-format msgid "Tabs" msgstr "\xD2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF" -#: Merge.rc:1202 +#: Merge.rc:1203 #, c-format msgid "&Tab size:" msgstr "&\xC3\xEE\xEB\xE5\xEC\xE8\xED\xE0 \xED\xE0 \xF2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF\xF2\xE0:" -#: Merge.rc:1205 +#: Merge.rc:1206 #, c-format msgid "&Insert Tabs" msgstr "&\xD1\xEB\xEE\xE6\xE8 \xF2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF" -#: Merge.rc:1207 +#: Merge.rc:1208 #, c-format msgid "Insert &Spaces" msgstr "\xD1\xEB\xEE\xE6\xE8 &\xF0\xE0\xE7\xF1\xF2\xEE\xFF\xED\xE8\xFF" -#: Merge.rc:1209 +#: Merge.rc:1210 #, c-format msgid "Line Difference Coloring" msgstr "\xCE\xF6\xE2\xE5\xF2\xFF\xE2\xE0\xE9 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1 \xF0\xE0\xE7\xEB\xE8\xEA\xE8" -#: Merge.rc:1211 +#: Merge.rc:1212 #, c-format msgid "View line differences" msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5 \xE2 \xF0\xE5\xE4\xE0" -#: Merge.rc:1213 +#: Merge.rc:1214 #, c-format msgid "&Character level" msgstr "\xCD\xE8\xE2\xEE &\xF1\xE8\xEC\xE2\xEE\xEB" -#: Merge.rc:1215 +#: Merge.rc:1216 #, c-format msgid "&Word-level:" msgstr "\xCD\xE8\xE2\xEE &\xE4\xF3\xEC\xE0:" -#: Merge.rc:1230 +#: Merge.rc:1231 #, c-format msgid "Filefilters" msgstr "\xD4\xE0\xE9\xEB\xEE\xE2\xE8 \xF4\xE8\xEB\xF2\xF0\xE8" -#: Merge.rc:1236 +#: Merge.rc:1237 #, c-format msgid "Test" msgstr "\xD2\xE5\xF1\xF2\xE2\xE0\xE9" -#: Merge.rc:1237 +#: Merge.rc:1238 #, c-format msgid "Install..." msgstr "\xC8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xE9..." -#: Merge.rc:1238 +#: Merge.rc:1239 #, c-format msgid "New..." msgstr "\xCD\xEE\xE2..." -#: Merge.rc:1239 +#: Merge.rc:1240 #, c-format msgid "Edit..." msgstr "\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xE9..." -#: Merge.rc:1240 +#: Merge.rc:1241 #, c-format msgid "Delete..." msgstr "\xC8\xE7\xF2\xF0\xE8\xE9..." -#: Merge.rc:1246 +#: Merge.rc:1247 #, c-format msgid "Save modified files?" msgstr "\xC7\xE0\xEF\xE8\xF1 \xED\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE5\xED\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5?" -#: Merge.rc:1249 +#: Merge.rc:1250 #, c-format msgid "Left side file" msgstr "\xCB\xFF\xE2 \xF4\xE0\xE9\xEB" -#: Merge.rc:1252 +#: Merge.rc:1253 #, c-format msgid "&Save changes" msgstr "&\xC7\xE0\xEF\xE8\xF8\xE8 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5" -#: Merge.rc:1254 +#: Merge.rc:1255 #, c-format msgid "&Discard changes" msgstr "&\xCE\xF2\xEC\xE5\xED\xE8 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5" -#: Merge.rc:1256 +#: Merge.rc:1257 #, c-format msgid "Right side file" msgstr "\xC4\xE5\xF1\xE5\xED \xF4\xE0\xE9\xEB" -#: Merge.rc:1259 +#: Merge.rc:1260 #, c-format msgid "S&ave changes" msgstr "\xC7&\xE0\xEF\xE8\xF8\xE8 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5" -#: Merge.rc:1261 +#: Merge.rc:1262 #, c-format msgid "Dis&card changes" msgstr "\xCE&\xF2\xEC\xE5\xED\xE8 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5" -#: Merge.rc:1263 +#: Merge.rc:1264 #, c-format msgid "Discard All" msgstr "\xCE\xF2\xEC\xE5\xED\xE8 \xE2\xF1\xE8\xF7\xEA\xE8" -#: Merge.rc:1270 -#: Merge.rc:1518 -#: Merge.rc:1936 +#: Merge.rc:1271 +#: Merge.rc:1519 +#: Merge.rc:1937 #, c-format msgid "Codepage" msgstr "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0" -#: Merge.rc:1273 +#: Merge.rc:1274 #, c-format msgid "Default Codepage" msgstr "\xD1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0" -#: Merge.rc:1274 +#: Merge.rc:1275 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "\xC8\xE7\xE1\xE5\xF0\xE5\xF2\xE5 \xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xE7\xE0 \xED\xE5-Unicode \xF4\xE0\xE9\xEB\xEE\xE2\xE5:" -#: Merge.rc:1276 +#: Merge.rc:1277 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2044,32 +2049,32 @@ "\xC7\xE0\xF1\xE5\xF7\xE8 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0\xF2\xE0 \xE7\xE0 \xF1\xEB\xE5\xE4\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 : .html, .rc, .xml \n" "\xE8\xE7\xE8\xF1\xEA\xE2\xE0 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5 \xED\xE0 \xF1\xE5\xF1\xE8\xFF\xF2\xE0" -#: Merge.rc:1279 +#: Merge.rc:1280 #, c-format msgid "System codepage" msgstr "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xED\xE0 \xF1\xE8\xF1\xF2\xE5\xEC\xE0\xF2\xE0" -#: Merge.rc:1281 +#: Merge.rc:1282 #, c-format msgid "According to WinMerge User Interface" msgstr "\xD1\xEF\xEE\xF0\xE5\xE4 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\xE0 \xED\xE0 WinMerge" -#: Merge.rc:1283 +#: Merge.rc:1284 #, c-format msgid "Custom codepage :" msgstr "\xCF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 :" -#: Merge.rc:1291 +#: Merge.rc:1292 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - \xC7\xE0\xE1\xF0\xE0\xED\xE5\xED\xE0 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8" -#: Merge.rc:1294 +#: Merge.rc:1295 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "\xCD\xE5 \xE5 \xE7\xE0\xF1\xE5\xF7\xE5\xED\xE0 \xE2\xE5\xF0\xF1\xE8\xFF \xED\xE0 7-Zip (\xED\xE5 \xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xE0?)" -#: Merge.rc:1297 +#: Merge.rc:1298 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2078,12 +2083,12 @@ "\xCF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0\xF2\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8 \xE8\xE7\xE8\xF1\xEA\xE2\xE0 7-Zip 3.11 \xE8\xEB\xE8 \xEF\xEE-\xED\xEE\xE2 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED \xED\xE0 \xC2\xE0\xF8\xE8\xFF \xEA\xEE\xEC\xEF\xFE\xF2\xFA\xF0, \xE8\xEB\xE8 \xED\xE5\xE3\xEE\xE2\xE8\xF2\xE5 \n" "\xE2\xE0\xE6\xED\xE8 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE8 \xE4\xE0 \xE1\xFA\xE4\xE0\xF2 \xEA\xEE\xEF\xE8\xF0\xE0\xED\xE8 \xE2 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xED\xE0\xF2\xE0 \xEF\xE0\xEF\xEA\xE0 \xE7\xE0 \xED\xE5\xE7\xE0\xE2\xE8\xF1\xE8\xEC\xE8 \xEE\xEF\xE5\xF0\xE0\xF6\xE8\xE8." -#: Merge.rc:1299 +#: Merge.rc:1300 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "\xD2\xF0\xFF\xE1\xE2\xE0 \xE4\xE0 \xE8\xEC\xE0 \xEF\xEE\xE4\xF5\xEE\xE4\xFF\xF9\xE0 \xE4\xEE\xE1\xE0\xE2\xEA\xE0 (Merge7z*.dll) \xE2 \xEF\xFA\xF2\xFF." -#: Merge.rc:1301 +#: Merge.rc:1302 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2092,12 +2097,12 @@ "\xCC\xEE\xEB\xFF \xE8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9\xF2\xE5 \xEF\xF0\xE5\xEF\xEE\xF0\xFA\xF7\xE8\xF2\xE5\xEB\xED\xE0\xF2\xE0 \xEE\xF2\xE4\xEE\xEB\xF3 \xE2\xE5\xF0\xF1\xE8\xFF \xED\xE0 7-Zip \xE4\xEE\xEA\xE0\xF2\xEE \xE8\xE7\xEB\xE5\xE7\xE5 \xE4\xEE\xE1\xE0\xE2\xEA\xE0\xF2\xE0\n" "\xE7\xE0 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE0\xF2\xE0 \xE2\xE5\xF0\xF1\xE8\xFF." -#: Merge.rc:1303 +#: Merge.rc:1304 #, c-format msgid "Version" msgstr "\xC2\xE5\xF0\xF1\xE8\xFF" -#: Merge.rc:1305 +#: Merge.rc:1306 #, c-format msgid "" "Plugin required\n" @@ -2106,551 +2111,551 @@ "\xCD\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xE0 \xE4\xEE\xE1\xE0\xE2\xEA\xE0\n" "(dllbuild %04u)" -#: Merge.rc:1307 +#: Merge.rc:1308 #, c-format msgid "Recommended version of 7-Zip:" msgstr "\xCF\xF0\xE5\xEF\xEE\xF0\xFA\xF7\xE8\xF2\xE5\xEB\xED\xE0 \xE2\xE5\xF0\xF1\xE8\xFF \xED\xE0 7-Zip:" -#: Merge.rc:1310 -#: Merge.rc:1313 +#: Merge.rc:1311 +#: Merge.rc:1314 #, c-format msgid "present" msgstr "\xED\xE0\xEB\xE8\xF7\xED\xE0" -#: Merge.rc:1311 +#: Merge.rc:1312 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1314 +#: Merge.rc:1315 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED \xED\xE0 \xE2\xE0\xF8\xE8\xFF \xEA\xEE\xEC\xEF\xFE\xF2\xFA\xF0:" -#: Merge.rc:1316 -#: Merge.rc:1321 +#: Merge.rc:1317 +#: Merge.rc:1322 #, c-format msgid "none" msgstr "\xED\xFF\xEC\xE0" -#: Merge.rc:1318 +#: Merge.rc:1319 #, c-format msgid "missing" msgstr "\xEB\xE8\xEF\xF1\xE2\xE0" -#: Merge.rc:1319 +#: Merge.rc:1320 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2 \xE7\xE0 \xED\xE5\xE7\xE0\xE2\xE8\xF1\xE8\xEC\xE8 \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xFF:" -#: Merge.rc:1323 +#: Merge.rc:1324 #, c-format msgid "outdated" msgstr "\xEE\xF1\xF2\xE0\xF0\xFF\xEB" -#: Merge.rc:1324 +#: Merge.rc:1325 #, c-format msgid "Plugins on path:" msgstr "\xCF\xFA\xF2 \xED\xE0 \xE4\xEE\xE1\xE0\xE2\xEA\xE0:" -#: Merge.rc:1325 +#: Merge.rc:1326 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xEF\xE0\xEA \xF2\xEE\xE2\xE0 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n(\xC2\xE8\xED\xE0\xE3\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE3\xEE \xE8\xE7\xE2\xE8\xEA\xE0\xF2\xE5 \xEE\xF2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9.)" -#: Merge.rc:1329 +#: Merge.rc:1330 #, c-format msgid "Plugin Download" msgstr "\xD1\xE2\xE0\xEB\xE8 \xE4\xEE\xE1\xE0\xE2\xEA\xE8" -#: Merge.rc:1338 +#: Merge.rc:1339 #, c-format msgid "Options" msgstr "\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8" -#: Merge.rc:1349 +#: Merge.rc:1350 #, c-format msgid " Categories" msgstr " \xCA\xE0\xF2\xE5\xE3\xEE\xF0\xE8\xE8" -#: Merge.rc:1351 +#: Merge.rc:1352 #, c-format msgid "Import..." msgstr "\xC8\xEC\xEF\xEE\xF0\xF2..." -#: Merge.rc:1352 +#: Merge.rc:1353 #, c-format msgid "Export..." msgstr "\xC5\xEA\xF1\xEF\xEE\xF0\xF2..." -#: Merge.rc:1360 +#: Merge.rc:1361 #, c-format msgid "Keywords:" msgstr "\xCA\xEB\xFE\xF7\xEE\xE2\xE8 \xE4\xF3\xEC\xE8:" -#: Merge.rc:1361 +#: Merge.rc:1362 #, c-format msgid "Function names:" msgstr "\xC8\xEC\xE5\xED\xE0 \xED\xE0 \xF4\xF3\xED\xEA\xF6\xE8\xE8:" -#: Merge.rc:1362 +#: Merge.rc:1363 #, c-format msgid "Comments:" msgstr "\xCA\xEE\xEC\xE5\xED\xF2\xE0\xF0\xE8:" -#: Merge.rc:1363 +#: Merge.rc:1364 #, c-format msgid "Numbers:" msgstr "\xD7\xE8\xF1\xEB\xE0:" -#: Merge.rc:1364 +#: Merge.rc:1365 #, c-format msgid "Operators:" msgstr "\xCE\xEF\xE5\xF0\xE0\xF2\xEE\xF0\xE8:" -#: Merge.rc:1365 +#: Merge.rc:1366 #, c-format msgid "Strings:" msgstr "\xD1\xF2\xF0\xE8\xED\xE3\xEE\xE2\xE5:" -#: Merge.rc:1366 +#: Merge.rc:1367 #, c-format msgid "Preprocessor:" msgstr "\xCF\xF0\xE5\xE4\xEF\xF0\xEE\xF6\xE5\xF1\xEE\xF0:" -#: Merge.rc:1367 +#: Merge.rc:1368 #, c-format msgid "User 1:" msgstr "\xCF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB 1:" -#: Merge.rc:1368 +#: Merge.rc:1369 #, c-format msgid "User 2:" msgstr "\xCF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB 2:" -#: Merge.rc:1373 -#: Merge.rc:1378 -#: Merge.rc:1383 -#: Merge.rc:1388 -#: Merge.rc:1393 -#: Merge.rc:1398 -#: Merge.rc:1403 -#: Merge.rc:1408 -#: Merge.rc:1413 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 +#: Merge.rc:1414 #, c-format msgid "Bold" msgstr "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED" -#: Merge.rc:1421 +#: Merge.rc:1422 #, c-format msgid "Folder Compare Report" msgstr "\xCE\xF2\xF7\xE5\xF2 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8" -#: Merge.rc:1424 +#: Merge.rc:1425 #, c-format msgid "Report &File:" msgstr "\xD4\xE0\xE9\xEB:" -#: Merge.rc:1427 -#: Merge.rc:1601 -#: Merge.rc:1605 -#: Merge.rc:1632 +#: Merge.rc:1428 +#: Merge.rc:1602 +#: Merge.rc:1606 +#: Merge.rc:1633 #, c-format msgid "Browse..." msgstr "\xCF\xEE\xF2\xFA\xF0\xF1\xE8..." -#: Merge.rc:1428 +#: Merge.rc:1429 #, c-format msgid "&Style:" msgstr "&\xD1\xF2\xE8\xEB:" -#: Merge.rc:1431 +#: Merge.rc:1432 #, c-format msgid "&Copy to Clipboard" msgstr "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9 \xE2 \xEA\xEB\xE8\xEF\xE1\xEE\xF0\xE4\xE0" -#: Merge.rc:1439 +#: Merge.rc:1440 #, c-format msgid "Shared or Private Filter" msgstr "\xD1\xEF\xEE\xE4\xE5\xEB\xE5\xED \xE8\xEB\xE8 \xF1\xEE\xE1\xF1\xF2\xE2\xE5\xED \xF4\xE8\xEB\xF2\xFA\xF0" -#: Merge.rc:1442 +#: Merge.rc:1443 #, c-format msgid "Which type of filter do you want to create?" msgstr "\xCA\xEE\xE9 \xF2\xE8\xEF \xF4\xE8\xEB\xF2\xFA\xF0 \xE8\xF1\xEA\xE0\xF2\xE5 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5?" -#: Merge.rc:1444 +#: Merge.rc:1445 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "\xD1\xEF\xEE\xE4\xE5\xEB\xE5\xED \xF4\xE8\xEB\xF2\xFA\xF0 (\xE7\xE0 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xE8 \xED\xE0 \xF2\xEE\xE7\xE8 \xEA\xEE\xEC\xEF\xFE\xF2\xFA\xF0)" -#: Merge.rc:1446 +#: Merge.rc:1447 #, c-format msgid "Private Filter (only for current user)" msgstr "\xD1\xEE\xE1\xF1\xF2\xE2\xE5\xED \xF4\xE8\xEB\xF2\xFA\xF0 (\xF1\xE0\xEC\xEE \xE7\xE0 \xF2\xE5\xEA\xF3\xF9\xE8\xFF \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB)" -#: Merge.rc:1454 -#: Merge.rc:1937 +#: Merge.rc:1455 +#: Merge.rc:1938 #, c-format msgid "Archive Support" msgstr "\xCF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8" -#: Merge.rc:1457 +#: Merge.rc:1458 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "\xCF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0\xF2\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8 \xE8\xE7\xE8\xF1\xEA\xE2\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xE0 7-Zip \xE4\xEE\xE1\xE0\xE2\xEA\xE0:" -#: Merge.rc:1459 +#: Merge.rc:1460 #, c-format msgid "Download 7-zip Plugin" msgstr "\xD1\xE2\xE0\xEB\xE8 7-zip \xE4\xEE\xE1\xE0\xE2\xEA\xE0" -#: Merge.rc:1460 +#: Merge.rc:1461 #, c-format msgid "&Enable archive file support" msgstr "&\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8" -#: Merge.rc:1462 +#: Merge.rc:1463 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&\xC8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9 \xEE\xF2\xE4\xE5\xEB\xE5\xED 7-Zip \xE0\xEA\xEE \xE5 \xED\xE0 \xEB\xE8\xF6\xE5" -#: Merge.rc:1465 +#: Merge.rc:1466 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "\xC8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9 \xEB\xEE\xEA\xE0\xEB\xE5\xED 7-Zip \xEE\xF2 \xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xED\xE0 WinMerge" -#: Merge.rc:1467 +#: Merge.rc:1468 #, c-format msgid "&Detect archive type from file signature" msgstr "&\xC7\xE0\xF1\xE5\xF7\xE8 \xE0\xF0\xF5\xE8\xE2\xE0 \xEE\xF2 \xF4\xE0\xE9\xEB\xEE\xE2\xE0\xF2\xE0 \xF1\xE8\xE3\xED\xE0\xF2\xF3\xF0\xE0" -#: Merge.rc:1475 +#: Merge.rc:1476 #, c-format msgid "Compare Statistics" msgstr "\xD1\xF2\xE0\xF2\xE8\xF1\xF2\xE8\xEA\xE0 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5" -#: Merge.rc:1478 +#: Merge.rc:1479 #, c-format msgid "Folders:" msgstr "\xCF\xE0\xEF\xEA\xE8:" -#: Merge.rc:1479 +#: Merge.rc:1480 #, c-format msgid "Files:" msgstr "\xD4\xE0\xE9\xEB\xE0:" -#: Merge.rc:1480 -#: Merge.rc:2316 +#: Merge.rc:1481 +#: Merge.rc:2319 #, c-format msgid "Different" msgstr "\xD0\xE0\xE7\xEB\xE8\xF7\xED\xE8" -#: Merge.rc:1481 +#: Merge.rc:1482 #, c-format msgid "Text:" msgstr "\xD2\xE5\xEA\xF1\xF2:" -#: Merge.rc:1484 -#: Merge.rc:1503 +#: Merge.rc:1485 +#: Merge.rc:1504 #, c-format msgid "Binary:" msgstr "\xC4\xE2\xEE\xE8\xF7\xED\xE8:" -#: Merge.rc:1487 +#: Merge.rc:1488 #, c-format msgid "Unique" msgstr "\xD3\xED\xE8\xEA\xE0\xEB\xED\xE8" -#: Merge.rc:1488 +#: Merge.rc:1489 #, c-format msgid "Left:" msgstr "\xCB\xFF\xE2\xEE:" -#: Merge.rc:1493 +#: Merge.rc:1494 #, c-format msgid "Right:" msgstr "\xC4\xFF\xF1\xED\xEE:" -#: Merge.rc:1498 -#: Merge.rc:2310 +#: Merge.rc:1499 +#: Merge.rc:2313 #, c-format msgid "Identical" msgstr "\xC8\xE4\xE5\xED\xF2\xE8\xF7\xED\xE8" -#: Merge.rc:1507 +#: Merge.rc:1508 #, c-format msgid "Total:" msgstr "\xCE\xE1\xF9\xEE:" -#: Merge.rc:1512 +#: Merge.rc:1513 #, c-format msgid "Close" msgstr "\xC7\xE0\xF2\xE2\xEE\xF0\xE8" -#: Merge.rc:1521 +#: Merge.rc:1522 #, c-format msgid "Affects" msgstr "\xCF\xF0\xEE\xEC\xE5\xED\xE8" -#: Merge.rc:1524 -#: Merge.rc:1527 +#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "(Affects)" msgstr "(\xCF\xF0\xEE\xEC\xE5\xED\xE8)" -#: Merge.rc:1528 +#: Merge.rc:1529 #, c-format msgid "Select Codepage for" msgstr "\xC8\xE7\xE1\xE5\xF0\xE5\xF2\xE5 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xE7\xE0" -#: Merge.rc:1529 +#: Merge.rc:1530 #, c-format msgid "&File Loading:" msgstr "&\xC7\xE0\xF0\xE5\xE6\xE4\xE0\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB:" -#: Merge.rc:1531 -#: Merge.rc:1534 +#: Merge.rc:1532 +#: Merge.rc:1535 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1532 +#: Merge.rc:1533 #, c-format msgid "File &Saving:" msgstr "\xC7\xE0\xEF\xE8\xF1\xE2\xE0\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB:" -#: Merge.rc:1535 +#: Merge.rc:1536 #, c-format msgid "&Use same codepage for both" msgstr "&\xC8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9 \xE5\xE4\xED\xE0\xEA\xE2\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xE8 \xE7\xE0 \xE4\xE2\xE5\xF2\xE5" -#: Merge.rc:1538 +#: Merge.rc:1539 #, c-format msgid "&Apply" msgstr "&\xCF\xF0\xE8\xEB\xEE\xE6\xE8" -#: Merge.rc:1539 -#: Merge.rc:1903 +#: Merge.rc:1540 +#: Merge.rc:1904 #, c-format msgid "&Cancel" msgstr "&\xCE\xF2\xEC\xE5\xED\xE8" -#: Merge.rc:1544 +#: Merge.rc:1545 #, c-format msgid "Test Filter" msgstr "\xD2\xE5\xF1\xF2 \xED\xE0 \xF4\xE8\xEB\xF2\xFA\xF0" -#: Merge.rc:1547 +#: Merge.rc:1548 #, c-format msgid "Testing filter ..." msgstr "\xD2\xE5\xF1\xF2\xE2\xE0\xED\xE5 \xED\xE0 \xF4\xE8\xEB\xF2\xFA\xF0 ..." -#: Merge.rc:1549 +#: Merge.rc:1550 #, c-format msgid "&Enter text to test:" msgstr "&\xC2\xFA\xE2\xE5\xE4\xE5\xF2\xE5 \xF2\xE5\xEA\xF1\xF2 \xE7\xE0 \xF2\xE5\xF1\xF2\xE2\xE0\xED\xE5:" -#: Merge.rc:1551 +#: Merge.rc:1552 #, c-format msgid "&Folder Name" msgstr "&\xC8\xEC\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE0" -#: Merge.rc:1553 +#: Merge.rc:1554 #, c-format msgid "Result:" msgstr "\xD0\xE5\xE7\xF3\xEB\xF2\xE0\xF2:" -#: Merge.rc:1557 +#: Merge.rc:1558 #, c-format msgid "&Test" msgstr "&\xD2\xE5\xF1\xF2\xE2\xE0\xE9" -#: Merge.rc:1558 +#: Merge.rc:1559 #, c-format msgid "&Close" msgstr "&\xC7\xE0\xF2\xE2\xEE\xF0\xE8" -#: Merge.rc:1566 +#: Merge.rc:1567 #, c-format msgid "&Use customized text colors" msgstr "&\xC8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9 \xE7\xE0\xE4\xE0\xE4\xE5\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5 \xE7\xE0 \xF2\xE5\xEA\xF1\xF2\xE0" -#: Merge.rc:1569 +#: Merge.rc:1570 #, c-format msgid "Custom text colors" msgstr "\xC7\xE0\xE4\xE0\xE4\xE5\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5 \xED\xE0 \xF2\xE5\xEA\xF1\xF2" -#: Merge.rc:1571 +#: Merge.rc:1572 #, c-format msgid "Whitespace:" msgstr "\xC1\xFF\xEB\xEE \xEF\xF0\xEE\xF1\xF2\xF0\xE0\xED\xF1\xF2\xE2\xEE:" -#: Merge.rc:1572 +#: Merge.rc:1573 #, c-format msgid "Regular text:" msgstr "\xCD\xEE\xF0\xEC\xE0\xEB\xE5\xED \xF2\xE5\xEA\xF1\xF2:" -#: Merge.rc:1573 +#: Merge.rc:1574 #, c-format msgid "Selection:" msgstr "\xC8\xE7\xE1\xF0\xE0\xED:" -#: Merge.rc:1596 +#: Merge.rc:1597 #, c-format msgid "Paths" msgstr "\xCF\xFA\xF2\xE8\xF9\xE0" -#: Merge.rc:1602 +#: Merge.rc:1603 #, c-format msgid "R&ead-only" msgstr "\xD1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5" -#: Merge.rc:1606 +#: Merge.rc:1607 #, c-format msgid "Re&ad-only" msgstr "\xD1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5" -#: Merge.rc:1612 +#: Merge.rc:1613 #, c-format msgid "Open..." msgstr "\xCE\xF2\xE2\xEE\xF0\xE8..." -#: Merge.rc:1613 +#: Merge.rc:1614 #, c-format msgid "Save..." msgstr "\xC7\xE0\xEF\xE8\xF8\xE8..." -#: Merge.rc:1618 -#: Merge.rc:1938 +#: Merge.rc:1619 +#: Merge.rc:1939 #, c-format msgid "Backup Files" msgstr "\xD0\xE5\xE7\xE5\xF0\xE2\xED\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5" -#: Merge.rc:1621 +#: Merge.rc:1622 #, c-format msgid "Create backup files in:" msgstr "\xD1\xFA\xE7\xE4\xE0\xE9 \xF0\xE5\xE7\xE5\xF0\xE2\xED\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xE2:" -#: Merge.rc:1626 +#: Merge.rc:1627 #, c-format msgid "Create backup files into:" msgstr "\xD1\xFA\xE7\xE4\xE0\xE9 \xF0\xE5\xE7\xE5\xF0\xE2\xED\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xE2:" -#: Merge.rc:1627 +#: Merge.rc:1628 #, c-format msgid "&Original file's folder" msgstr "\xCE\xF0\xE8\xE3\xE8\xED\xE0\xEB\xED\xE0 \xEF\xE0\xEF\xEA\xE0 \xED\xE0 \xF4\xE0\xE9\xEB\xE0" -#: Merge.rc:1629 +#: Merge.rc:1630 #, c-format msgid "&Global backup folder:" msgstr "\xC3\xEB\xEE\xE1\xE0\xEB\xED\xE0 \xF0\xE5\xE7\xE5\xF0\xE2\xED\xE0 \xEF\xE0\xEF\xEA\xE0" -#: Merge.rc:1633 +#: Merge.rc:1634 #, c-format msgid "Backup filename:" msgstr "\xD0\xE5\xE7\xE5\xF0\xE2\xED\xEE \xE8\xEC\xE5:" -#: Merge.rc:1634 +#: Merge.rc:1635 #, c-format msgid "&Append .bak -extension" msgstr "\xC4\xEE\xE1\xE0\xE2\xE8 .bak -\xF0\xE0\xE7\xF8\xE8\xF0\xE5\xED\xE8\xE5" -#: Merge.rc:1636 +#: Merge.rc:1637 #, c-format msgid "A&ppend timestamp" msgstr "\xC4\xEE\xE1\xE0\xE2\xE8 \xE2\xF0\xE5\xEC\xE5" -#: Merge.rc:1643 -#: Merge.rc:2225 +#: Merge.rc:1644 +#: Merge.rc:2228 #, c-format msgid "Confirm Copy" msgstr "\xCF\xEE\xF2\xE2\xFA\xF0\xE4\xE8 \xEA\xEE\xEF\xE8\xF0\xE0\xED\xE5" -#: Merge.rc:1647 +#: Merge.rc:1648 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEA\xEE\xEF\xE8\xF0\xE0\xF2\xE5 XXX \xED\xE5\xF9\xE0?" -#: Merge.rc:1649 +#: Merge.rc:1650 #, c-format msgid "From left" msgstr "\xCE\xF2 \xEB\xFF\xE2\xEE" -#: Merge.rc:1652 +#: Merge.rc:1653 #, c-format msgid "To right" msgstr "\xCA\xFA\xEC \xE4\xFF\xF1\xED\xEE" -#: Merge.rc:1655 +#: Merge.rc:1656 #, c-format msgid "Yes" msgstr "\xC4\xE0" -#: Merge.rc:1656 +#: Merge.rc:1657 #, c-format msgid "No" msgstr "\xCD\xE5" -#: Merge.rc:1662 +#: Merge.rc:1663 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1665 +#: Merge.rc:1666 #, c-format msgid "&Enable plugins" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1695 +#: Merge.rc:1696 #, c-format msgid "040904e4" msgstr "040204e3" #. VarFileInfo.Translation -#: Merge.rc:1711 +#: Merge.rc:1712 #, c-format msgid "0x409, 1252" msgstr "0x402, 1251" -#: Merge.rc:1726 +#: Merge.rc:1727 #, c-format msgid "Ready" msgstr "\xC3\xEE\xF2\xEE\xE2" -#: Merge.rc:1732 +#: Merge.rc:1733 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1733 +#: Merge.rc:1734 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1734 +#: Merge.rc:1735 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1735 +#: Merge.rc:1736 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1737 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1737 +#: Merge.rc:1738 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1743 +#: Merge.rc:1744 #, c-format msgid "" "Create empty documents\n" @@ -2659,7 +2664,7 @@ "\xD1\xFA\xE7\xE4\xE0\xE9 \xED\xEE\xE2 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\n" "\xCD\xEE\xE2 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2 (Ctrl+N)" -#: Merge.rc:1744 +#: Merge.rc:1745 #, c-format msgid "" "Open an existing document\n" @@ -2668,7 +2673,7 @@ "\xCE\xF2\xE2\xEE\xF0\xE8 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\n" "\xCE\xF2\xE2\xEE\xF0\xE8 (Ctrl+O)" -#: Merge.rc:1745 +#: Merge.rc:1746 #, c-format msgid "" "Close the active document\n" @@ -2677,7 +2682,7 @@ "\xC7\xE0\xF2\xE2\xEE\xF0\xE8 \xE4\xE5\xE9\xF1\xF2\xE2\xE0\xF9\xE8\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\n" "\xC7\xE0\xF2\xE2\xEE\xF0\xE8" -#: Merge.rc:1746 +#: Merge.rc:1747 #, c-format msgid "" "Save the active document\n" @@ -2686,7 +2691,7 @@ "\xC7\xE0\xEF\xE8\xF8\xE8 \xF2\xE5\xEA\xF3\xF9\xE8\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\n" "\xC7\xE0\xEF\xE8\xF8\xE8 (Ctrl+S)" -#: Merge.rc:1747 +#: Merge.rc:1748 #, c-format msgid "" "Save the active document with a new name\n" @@ -2695,7 +2700,7 @@ "\xC7\xE0\xEF\xE8\xF8\xE8 \xF2\xE5\xEA\xF3\xF9\xE8\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2 \xF1 \xED\xEE\xE2\xEE \xE8\xEC\xE5\n" "\xC7\xE0\xEF\xE8\xF8\xE8 \xEA\xE0\xF2\xEE" -#: Merge.rc:1748 +#: Merge.rc:1749 #, c-format msgid "" "Change the printing options\n" @@ -2704,7 +2709,7 @@ "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5 \xED\xE0 \xEF\xF0\xE8\xED\xF2\xE5\xF0\xE0\n" "\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0" -#: Merge.rc:1749 +#: Merge.rc:1750 #, c-format msgid "" "Change the printer and printing options\n" @@ -2713,7 +2718,7 @@ "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5 \xED\xE0 \xEF\xF0\xE8\xED\xF2\xE5\xF0\xE0 \xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5 \xE7\xE0 \xEF\xF0\xE8\xED\xF2\xE8\xF0\xE0\xED\xE5\n" "\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xE7\xE0 \xEF\xF0\xE8\xED\xF2\xE8\xF0\xE0\xED\xE5" -#: Merge.rc:1750 +#: Merge.rc:1751 #, c-format msgid "" "Print the active document\n" @@ -2722,7 +2727,7 @@ "\xCF\xF0\xE8\xED\xF2\xE8\xF0\xE0\xE9 \xF2\xE5\xEA\xF3\xF9\xE8\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\n" "\xCF\xF0\xE8\xED\xF2\xE8\xF0\xE0\xE9" -#: Merge.rc:1751 +#: Merge.rc:1752 #, c-format msgid "" "Display full pages\n" @@ -2731,27 +2736,27 @@ "\xC2\xE8\xE6 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xEF\xF0\xE5\xE4\xE8 \xEF\xF0\xE8\xED\xF2\xE8\xF0\xE0\xED\xE5\n" "\xCF\xF0\xE5\xE3\xEB\xE5\xE4" -#: Merge.rc:1756 +#: Merge.rc:1757 #, c-format msgid "Make all hidden items visible again" msgstr "\xCD\xE0\xEF\xF0\xE0\xE2\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xF1\xEA\xF0\xE8\xF2\xE8 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 \xEE\xF2\xED\xEE\xE2\xEE \xE2\xE8\xE4\xE8\xEC\xE8" -#: Merge.rc:1757 +#: Merge.rc:1758 #, c-format msgid "Toggle tree mode" msgstr "" -#: Merge.rc:1758 +#: Merge.rc:1759 #, c-format msgid "Expand all subfolders" msgstr "" -#: Merge.rc:1759 +#: Merge.rc:1760 #, c-format msgid "Collapse all subfolders" msgstr "" -#: Merge.rc:1765 +#: Merge.rc:1766 #, c-format msgid "" "Open project file\n" @@ -2760,32 +2765,32 @@ "\xCE\xF2\xE2\xEE\xF0\xE8 \xF4\xE0\xE9\xEB\xEE\xE2 \xEF\xF0\xEE\xE5\xEA\xF2\n" "\xD4\xE0\xE9\xEB \xF1 \xEF\xF0\xEE\xE5\xEA\xF2 (Ctrl+J)" -#: Merge.rc:1766 +#: Merge.rc:1767 #, c-format msgid "Unknown error attempting to open project file" msgstr "\xCD\xE5\xEF\xEE\xE7\xED\xE0\xF2\xE0 \xE3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xEE\xF2\xE2\xE0\xF0\xFF\xED\xE5\xF2\xEE \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xF1 \xEF\xF0\xEE\xE5\xEA\xF2\xE0" -#: Merge.rc:1767 +#: Merge.rc:1768 #, c-format msgid "Unknown error attempting to save project file" msgstr "\xCD\xE5\xEF\xEE\xE7\xED\xE0\xF2\xE0 \xE3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xE7\xE0\xEF\xE8\xF1\xE2\xE0\xED\xE5\xF2\xEE \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xF1 \xEF\xF0\xEE\xE5\xEA\xF2\xE0" -#: Merge.rc:1768 +#: Merge.rc:1769 #, c-format msgid "Project File" msgstr "\xCF\xF0\xEE\xE5\xEA\xF2\xEE\xE2 \xF4\xE0\xE9\xEB" -#: Merge.rc:1769 +#: Merge.rc:1770 #, c-format msgid "Project file successfully loaded." msgstr "\xCF\xF0\xEE\xE5\xEA\xF2\xEE\xE2\xE8\xFF \xF4\xE0\xE9\xEB \xE5 \xE7\xE0\xF0\xE5\xE4\xE5\xED \xF3\xF1\xEF\xE5\xF8\xED\xEE." -#: Merge.rc:1770 +#: Merge.rc:1771 #, c-format msgid "Project file successfully saved." msgstr "\xCF\xF0\xEE\xE5\xEA\xF2\xEE\xE2\xE8\xFF \xF4\xE0\xE9\xEB \xE5 \xE7\xE0\xEF\xE8\xF1\xE0\xED \xF3\xF1\xEF\xE5\xF8\xED\xEE." -#: Merge.rc:1771 +#: Merge.rc:1772 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2794,7 +2799,7 @@ "\xC7\xE0\xEF\xE8\xF8\xE8 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xEF\xFA\xF2\xE8\xF9\xE0 \xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xE2 \xEF\xF0\xEE\xE5\xEA\xF2\xEE\xE2 \xF4\xE0\xE9\xEB\n" "\xC7\xE0\xEF\xE8\xF8\xE8 \xEF\xF0\xEE\xE5\xEA\xF2\xE0 \xE2\xFA\xE2 \xF4\xE0\xE9\xEB" -#: Merge.rc:1776 +#: Merge.rc:1777 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2803,7 +2808,7 @@ "\xCF\xF0\xE5\xE4\xF1\xF2\xE0\xE2\xFF \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0\xF2\xE0, \xE2\xE5\xF0\xF1\xE8\xFF\xF2\xE0 \xE8 \xE0\xE2\xF2\xEE\xF0\xF1\xEA\xEE\xF2\xEE \xEF\xF0\xE0\xE2\xEE\n" "\xC7\xE0" -#: Merge.rc:1777 +#: Merge.rc:1778 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2812,7 +2817,6 @@ "\xC8\xE7\xEB\xE8\xE7\xE0\xED\xE5 \xEE\xF2 \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xE5\xF2\xEE; \xED\xE0\xEF\... [truncated message content] |
From: <ki...@us...> - 2008-10-23 15:48:33
|
Revision: 6032 http://winmerge.svn.sourceforge.net/winmerge/?rev=6032&view=rev Author: kimmov Date: 2008-10-23 15:48:19 +0000 (Thu, 23 Oct 2008) Log Message: ----------- Update PO files to match current English.pot file. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/French.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2008-10-23 15:42:19 UTC (rev 6031) +++ trunk/Src/Languages/Brazilian.po 2008-10-23 15:48:19 UTC (rev 6032) @@ -722,7 +722,7 @@ msgstr "&Scripts" #: Merge.rc:370 -#: Merge.rc:2761 +#: Merge.rc:2767 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -1256,6 +1256,7 @@ msgstr "&Sistema de Vers\xF5es:" #: Merge.rc:748 +#: Merge.rc:2051 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" @@ -2044,10 +2045,8 @@ #: Merge.rc:1277 #, c-format -msgid "" -"Detect codepage info for these files : .html, .rc, .xml \n" -"need to restart session" -msgstr "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml - precisa reiniciar a sess\xE3o" +msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" +msgstr "" #: Merge.rc:1280 #, c-format @@ -2061,8 +2060,8 @@ #: Merge.rc:1284 #, c-format -msgid "Custom codepage :" -msgstr "C\xF3digo de p\xE1gina personalizado :" +msgid "Custom codepage:" +msgstr "" #: Merge.rc:1292 #, c-format @@ -3374,7 +3373,7 @@ msgstr "Tamanho" #: Merge.rc:2014 -#: Merge.rc:2625 +#: Merge.rc:2631 #, c-format msgid "Name" msgstr "Nome" @@ -3395,7 +3394,7 @@ msgstr "[F] " #: Merge.rc:2018 -#: Merge.rc:2627 +#: Merge.rc:2633 #, c-format msgid "Description" msgstr "Descri\xE7\xE3o" @@ -3497,15 +3496,10 @@ "\n" "Se voc\xEA n\xE3o quer atualizar todas as compara\xE7\xF5es agora voc\xEA pode selecionar o N\xE3o e atualizar as compara\xE7\xF5es mais tarde." -#: Merge.rc:2051 -#, c-format -msgid "&Path to cleartool.exe :" -msgstr "&Caminho para o cleartool.exe :" - #: Merge.rc:2052 #, c-format -msgid "&Path to SS.EXE :" -msgstr "&Caminho para o SS.EXE :" +msgid "&Path to SS.EXE:" +msgstr "" #: Merge.rc:2058 #, c-format @@ -3928,7 +3922,7 @@ " Por favor, verifique a spec da config da visualiza\xE7\xE3o usada." #: Merge.rc:2169 -#: Merge.rc:2609 +#: Merge.rc:2615 #, c-format msgid "None" msgstr "Nenhum" @@ -4360,7 +4354,7 @@ msgstr "Diferen\xE7as" #: Merge.rc:2300 -#: Merge.rc:2605 +#: Merge.rc:2611 #, c-format msgid "Binary" msgstr "Bin\xE1rio" @@ -4430,177 +4424,187 @@ msgid "Error" msgstr "Erro" +#: Merge.rc:2321 +#, c-format +msgid "Text files are identical" +msgstr "" + #: Merge.rc:2326 #, c-format +msgid "Text files are different" +msgstr "" + +#: Merge.rc:2332 +#, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2327 +#: Merge.rc:2333 #, c-format msgid "1 item selected" msgstr "1 item selecionado" -#: Merge.rc:2328 +#: Merge.rc:2334 #, c-format msgid "%1 items selected" msgstr "%1 itens selecionados" -#: Merge.rc:2334 +#: Merge.rc:2340 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou nome da pasta." -#: Merge.rc:2335 +#: Merge.rc:2341 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome da sub-pasta quando as sub-pastas s\xE3o inclu\xEDdas." -#: Merge.rc:2336 +#: Merge.rc:2342 #, c-format msgid "Comparison result, long form." msgstr "Resultado da compara\xE7\xE3o, formul\xE1rio longo" -#: Merge.rc:2337 +#: Merge.rc:2343 #, c-format msgid "Left side modification date." msgstr "Data de modifica\xE7\xE3o do lado esquerdo." -#: Merge.rc:2338 +#: Merge.rc:2344 #, c-format msgid "Right side modification date." msgstr "Data de modifica\xE7\xE3o do lado direito." -#: Merge.rc:2339 +#: Merge.rc:2345 #, c-format msgid "File's extension." msgstr "Extens\xE3o do arquivo." -#: Merge.rc:2340 +#: Merge.rc:2346 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do arquivo a esquerda em bytes." -#: Merge.rc:2341 +#: Merge.rc:2347 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do arquivo a direita em bytes." -#: Merge.rc:2342 +#: Merge.rc:2348 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do arquivo a esquerda abreviado." -#: Merge.rc:2343 +#: Merge.rc:2349 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do arquivo a direita abreviado." -#: Merge.rc:2349 +#: Merge.rc:2355 #, c-format msgid "Left side creation time." msgstr "Hora de cria\xE7\xE3o do lado esquerdo." -#: Merge.rc:2350 +#: Merge.rc:2356 #, c-format msgid "Right side creation time." msgstr "Hora da cria\xE7\xE3o do lado direito." -#: Merge.rc:2351 +#: Merge.rc:2357 #, c-format msgid "Tells which side has newer modification date." msgstr "Diz qual lado tem a data de modifica\xE7\xE3o mais nova." -#: Merge.rc:2352 +#: Merge.rc:2358 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Vers\xE3o do arquivo do lado esquerdo, s\xF3 para alguns tipos de arquivos." -#: Merge.rc:2353 +#: Merge.rc:2359 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Vers\xE3o do arquivo do lado direito, s\xF3 para alguns tipos de arquivos." -#: Merge.rc:2354 +#: Merge.rc:2360 #, c-format msgid "Short comparison result." msgstr "Resultado curto da compara\xE7\xE3o." -#: Merge.rc:2355 +#: Merge.rc:2361 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2356 +#: Merge.rc:2362 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2357 +#: Merge.rc:2363 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo do lado esquerdo" -#: Merge.rc:2358 +#: Merge.rc:2364 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo do lado direito" -#: Merge.rc:2364 +#: Merge.rc:2370 #, c-format msgid "Left side encoding." msgstr "Codifica\xE7\xE3o do lado esquerdo." -#: Merge.rc:2365 +#: Merge.rc:2371 #, c-format msgid "Right side encoding." msgstr "Codfica\xE7\xE3o do lado direito." -#: Merge.rc:2366 +#: Merge.rc:2372 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "N\xFAmero de diferen\xE7as ignoradas no arquivo. Estas diferen\xE7as s\xE3o ignoradas pelo WinMerge e n\xE3o podem ser unidas." -#: Merge.rc:2367 +#: Merge.rc:2373 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "N\xFAmero de diferen\xE7as no arquivo. Este n\xFAmero n\xE3o inclui as diferen\xE7as ignoradas." -#: Merge.rc:2368 +#: Merge.rc:2374 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostrar um asterisco (*) se o arquivo \xE9 bin\xE1rio." -#: Merge.rc:2374 +#: Merge.rc:2380 #, c-format msgid "Compare %1 with %2" msgstr "Comparar o %1 com o %2" -#: Merge.rc:2375 +#: Merge.rc:2381 #, c-format msgid "Comma-separated list" msgstr "Lista separada por v\xEDrgula" -#: Merge.rc:2376 +#: Merge.rc:2382 #, c-format msgid "Tab-separated list" msgstr "Lista separada por aba" -#: Merge.rc:2377 +#: Merge.rc:2383 #, c-format msgid "Simple HTML" msgstr "HTML Simples" -#: Merge.rc:2378 +#: Merge.rc:2384 #, c-format msgid "Simple XML" msgstr "XML Simples" -#: Merge.rc:2380 +#: Merge.rc:2386 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "O arquivo do relat\xF3rio j\xE1 existe. Voc\xEA quer sobrescrever o arquivo existente?" -#: Merge.rc:2381 +#: Merge.rc:2387 #, c-format msgid "" "Error creating the report:\n" @@ -4609,32 +4613,32 @@ "Erro ao criar o relat\xF3rio:\n" "%1" -#: Merge.rc:2382 +#: Merge.rc:2388 #, c-format msgid "The report has been created successfully." msgstr "O relat\xF3rio foi criado com sucesso." -#: Merge.rc:2388 +#: Merge.rc:2394 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo est\xE1 aberto em ambos os pain\xE9is." -#: Merge.rc:2389 +#: Merge.rc:2395 #, c-format msgid "The selected files are identical." msgstr "Os arquivos selecionados s\xE3o id\xEAnticos." -#: Merge.rc:2390 +#: Merge.rc:2396 #, c-format msgid "An error occurred while comparing the files." msgstr "Um erro ocoreu enquanto comparava os arquivos." -#: Merge.rc:2391 +#: Merge.rc:2397 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Os arquivos tempor\xE1rios n\xE3o puderam ser criados. Verifique suas configura\xE7\xF5es do caminho dos tempor\xE1rios." -#: Merge.rc:2392 +#: Merge.rc:2398 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4649,7 +4653,7 @@ "\n" "Nota: Se voc\xEA quer sempre tratar todos os tipos de retorno de procedimentos como equivalentes, configure a op\xE7\xE3o 'Ignorar diferen\xE7as de retorno dos procedimentos..' na aba Comparar do di\xE1logo das op\xE7\xF5es (dispon\xEDvel em Editar/Op\xE7\xF5es)." -#: Merge.rc:2393 +#: Merge.rc:2399 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4660,22 +4664,22 @@ " Com as op\xE7\xF5es atuais, eles ser\xE3o unificados ao tipo principal.\n" " Voc\xEA quer mudar as op\xE7\xF5es e preservar os EOL diferentes?" -#: Merge.rc:2394 +#: Merge.rc:2400 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Um erro ocorreu enquanto prediffing o arquivo '%1' com o plugin '%2'. O prediffing n\xE3o est\xE1 mais aplicado." -#: Merge.rc:2395 +#: Merge.rc:2401 #, c-format msgid "The selected folder is invalid." msgstr "A pasta selecionada \xE9 inv\xE1lida." -#: Merge.rc:2396 +#: Merge.rc:2402 #, c-format msgid "Cannot open a binary file to editor." msgstr "N\xE3o pode abrir um arquivo bin\xE1rio no editor." -#: Merge.rc:2397 +#: Merge.rc:2403 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4690,7 +4694,7 @@ "%1\n" "no outro lado e abrir estas pastas?" -#: Merge.rc:2403 +#: Merge.rc:2409 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4701,132 +4705,132 @@ "Exibir cada arquivo na sua p\xE1gina de c\xF3digo dar\xE1 uma melhor exibi\xE7\xE3o mas unir/copiar ser\xE1 perigoso.\n" "Voc\xEA gostaria de tratar ambos os arquivos como estando na p\xE1gina do c\xF3digo padr\xE3o do windows? (recomendado)" -#: Merge.rc:2404 +#: Merge.rc:2410 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Aviso: Os arquivos usam codifica\xE7\xF5es diferentes, esquerda=%s e direita=%s, e a uni\xE3o pode levar a perda de informa\xE7\xE3o." -#: Merge.rc:2405 +#: Merge.rc:2411 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informa\xE7\xE3o perdida devido a erros de codifica\xE7\xE3o: em ambos os arquivos" -#: Merge.rc:2406 +#: Merge.rc:2412 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informa\xE7\xE3o perdida devido a erros de codifica\xE7\xE3o: no arquivo direito" -#: Merge.rc:2407 +#: Merge.rc:2413 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informa\xE7\xE3o perdida devido a erros de codifica\xE7\xE3o: no arquivo esquerdo" -#: Merge.rc:2413 +#: Merge.rc:2419 #, c-format msgid "No difference" msgstr "Sem diferen\xE7a" -#: Merge.rc:2414 +#: Merge.rc:2420 #, c-format msgid "Line difference" msgstr "Diferen\xE7a da linha" -#: Merge.rc:2420 +#: Merge.rc:2426 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituiu %1 string(s)." -#: Merge.rc:2421 +#: Merge.rc:2427 #, c-format msgid "Cannot find string \"%s\"" msgstr "N\xE3o p\xF4de achar a string \"%s\"" -#: Merge.rc:2427 +#: Merge.rc:2433 #, c-format msgid "Copy Full Path" msgstr "Copiar o Caminho Completo" -#: Merge.rc:2428 +#: Merge.rc:2434 #, c-format msgid "Copy Filename" msgstr "Copiar o Nome do Arquivo" -#: Merge.rc:2434 +#: Merge.rc:2440 #, c-format msgid "Location Pane" msgstr "Painel de Localiza\xE7\xE3o" -#: Merge.rc:2435 +#: Merge.rc:2441 #, c-format msgid "Diff Pane" msgstr "Painel das Diferen\xE7as" -#: Merge.rc:2441 +#: Merge.rc:2447 #, c-format msgid "Patch file successfully written." msgstr "Arquivo patch gravado com sucesso." -#: Merge.rc:2442 +#: Merge.rc:2448 #, c-format msgid "1. item is not found or is directory!" msgstr "1. o item n\xE3o foi achado ou \xE9 diret\xF3rio!" -#: Merge.rc:2443 +#: Merge.rc:2449 #, c-format msgid "2. item is not found or is directory!" msgstr "2. o item n\xE3o foi achado ou \xE9 diret\xF3rio!" -#: Merge.rc:2444 +#: Merge.rc:2450 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O arquivo do patch j\xE1 existe. Voc\xEA quer sobrescrev\xEA-lo?" -#: Merge.rc:2445 +#: Merge.rc:2451 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos selecionados]" -#: Merge.rc:2446 +#: Merge.rc:2452 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2447 +#: Merge.rc:2453 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2448 +#: Merge.rc:2454 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2449 +#: Merge.rc:2455 #, c-format msgid "Could not write to file %1." msgstr "N\xE3o p\xF4de gravar no arquivo %1." -#: Merge.rc:2450 +#: Merge.rc:2456 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "O caminho de sa\xEDda especificado n\xE3o \xE9 um caminho absoluto: %1" -#: Merge.rc:2451 +#: Merge.rc:2457 #, c-format msgid "Specify an output file" msgstr "Especificar um arquivo de sa\xEDda" -#: Merge.rc:2452 +#: Merge.rc:2458 #, c-format msgid "Cannot create a patch file from binary files." msgstr "N\xE3o pode criar um arquivo patch dos arquivos bin\xE1rios." -#: Merge.rc:2453 +#: Merge.rc:2459 #, c-format msgid "Cannot create a patch file from directories." msgstr "N\xE3o pode criar um arquivo patch dos diret\xF3rios." -#: Merge.rc:2454 +#: Merge.rc:2460 #, c-format msgid "" "Please save all files first.\n" @@ -4837,17 +4841,17 @@ "\n" "Criar um patch requer que n\xE3o hajam mudan\xE7as n\xE3o salvas nos arquivos." -#: Merge.rc:2455 +#: Merge.rc:2461 #, c-format msgid "Folder does not exist." msgstr "A pasta n\xE3o existe." -#: Merge.rc:2460 +#: Merge.rc:2466 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Os resultados da compara\xE7\xE3o dos diret\xF3rios atuais ser\xE3o limpados." -#: Merge.rc:2461 +#: Merge.rc:2467 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4858,7 +4862,7 @@ "Todos os componentes necess\xE1rios (7-zip e/ou Merge7z*.dll) para o suporte para arquivos n\xE3o podem ser achados.\n" "Veja o manual para mais info sobre o suporte para arquivos e como ativ\xE1-lo." -#: Merge.rc:2462 +#: Merge.rc:2468 #, c-format msgid "" "\n" @@ -4867,7 +4871,7 @@ "\n" "Nota: A integra\xE7\xE3o do 7-Zip est\xE1 desativada nas configura\xE7\xF5es do WinMerge." -#: Merge.rc:2463 +#: Merge.rc:2469 #, c-format msgid "" "\n" @@ -4876,37 +4880,37 @@ "\n" "Nota: A integra\xE7\xE3o do 7-Zip est\xE1 restrita a opera\xE7\xE3o isolada nas configura\xE7\xF5es do WinMerge." -#: Merge.rc:2464 +#: Merge.rc:2470 #, c-format msgid "Select file for export" msgstr "Selecione o arquivo para exportar" -#: Merge.rc:2465 +#: Merge.rc:2471 #, c-format msgid "Select file for import" msgstr "Selecione o arquivo para importar" -#: Merge.rc:2466 +#: Merge.rc:2472 #, c-format msgid "Options imported from the file." msgstr "Op\xE7\xF5es importadas do arquivo" -#: Merge.rc:2467 +#: Merge.rc:2473 #, c-format msgid "Options exported to the file." msgstr "Op\xE7\xF5es exportadas para o arquivo." -#: Merge.rc:2468 +#: Merge.rc:2474 #, c-format msgid "Failed to import options from the file." msgstr "Falhou em importar as op\xE7\xF5es do arquivo." -#: Merge.rc:2469 +#: Merge.rc:2475 #, c-format msgid "Failed to write options to the file." msgstr "Falhou em gravar as op\xE7\xF5es no arquivo." -#: Merge.rc:2470 +#: Merge.rc:2476 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4917,493 +4921,493 @@ "\n" "Voc\xEA quer continuar?" -#: Merge.rc:2476 +#: Merge.rc:2482 #, c-format msgid "Regular expression error" msgstr "Erro da express\xE3o regular" -#: Merge.rc:2477 +#: Merge.rc:2483 #, c-format msgid "No match" msgstr "Nenhuma combina\xE7\xE3o" -#: Merge.rc:2478 +#: Merge.rc:2484 #, c-format msgid "Invalid regular expression" msgstr "Express\xE3o regular inv\xE1lida" -#: Merge.rc:2479 +#: Merge.rc:2485 #, c-format msgid "Invalid collation character" msgstr "Caractere de compara\xE7\xE3o inv\xE1lido" -#: Merge.rc:2480 +#: Merge.rc:2486 #, c-format msgid "Invalid character class name" msgstr "Nome da classe do caractere inv\xE1lido" -#: Merge.rc:2481 +#: Merge.rc:2487 #, c-format msgid "Trailing backslash" msgstr "Rastreando o backslash" -#: Merge.rc:2482 +#: Merge.rc:2488 #, c-format msgid "Invalid back reference" msgstr "Refer\xEAncia anterior inv\xE1lida" -#: Merge.rc:2483 +#: Merge.rc:2489 #, c-format msgid "Unmatched [ or [^" msgstr "N\xE3o compar\xE1vel [ ou [^ " -#: Merge.rc:2484 +#: Merge.rc:2490 #, c-format msgid "Unmatched ( or \\(" msgstr "N\xE3o compar\xE1vel ( ou \\(" -#: Merge.rc:2485 +#: Merge.rc:2491 #, c-format msgid "Unmatched \\{" msgstr "N\xE3o compar\xE1vel \\{" -#: Merge.rc:2486 +#: Merge.rc:2492 #, c-format msgid "Invalid content of \\{\\}" msgstr "Conte\xFAdo inv\xE1lido de \\{\\}" -#: Merge.rc:2487 +#: Merge.rc:2493 #, c-format msgid "Invalid range end" msgstr "Final do alcance inv\xE1lido" -#: Merge.rc:2488 +#: Merge.rc:2494 #, c-format msgid "Out of memory" msgstr "Sem mem\xF3ria" -#: Merge.rc:2489 +#: Merge.rc:2495 #, c-format msgid "Invalid preceding regular expression" msgstr "Express\xE3o regular precedente inv\xE1lida" -#: Merge.rc:2490 +#: Merge.rc:2496 #, c-format msgid "Premature end of regular expression" msgstr "Final prematuro da express\xE3o regular" -#: Merge.rc:2491 +#: Merge.rc:2497 #, c-format msgid "Regular expression too big" msgstr "Express\xE3o regular muito grande" -#: Merge.rc:2496 +#: Merge.rc:2502 #, c-format msgid "Unmatched ) or \\)" msgstr "N\xE3o compar\xE1vel ) ou \\)" -#: Merge.rc:2502 +#: Merge.rc:2508 #, c-format msgid "Western European" msgstr "Europeu Ocidental" -#: Merge.rc:2503 +#: Merge.rc:2509 #, c-format msgid "Eastern European" msgstr "Europeu Oriental" -#: Merge.rc:2504 +#: Merge.rc:2510 #, c-format msgid "East Asian" msgstr "Leste Asi\xE1tico" -#: Merge.rc:2505 +#: Merge.rc:2511 #, c-format msgid "SE & SW Asian" msgstr "Sudeste & Sudoeste Asi\xE1tico" -#: Merge.rc:2506 +#: Merge.rc:2512 #, c-format msgid "Middle Eastern" msgstr "Oriente M\xE9dio" -#: Merge.rc:2507 -#: Merge.rc:2517 +#: Merge.rc:2513 +#: Merge.rc:2523 #, c-format msgid "Not applicable" msgstr "N\xE3o aplic\xE1vel" -#: Merge.rc:2513 +#: Merge.rc:2519 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2514 +#: Merge.rc:2520 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2515 +#: Merge.rc:2521 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2516 +#: Merge.rc:2522 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2523 +#: Merge.rc:2529 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2524 +#: Merge.rc:2530 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cir\xEDlico" -#: Merge.rc:2530 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latim US" -#: Merge.rc:2531 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS \xC1rabe" -#: Merge.rc:2532 +#: Merge.rc:2538 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grego" -#: Merge.rc:2533 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Margem do B\xE1ltico" -#: Merge.rc:2534 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latim 1" -#: Merge.rc:2535 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grego 1" -#: Merge.rc:2536 +#: Merge.rc:2542 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latim 2" -#: Merge.rc:2537 +#: Merge.rc:2543 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cir\xEDlico" -#: Merge.rc:2538 +#: Merge.rc:2544 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turco" -#: Merge.rc:2539 +#: Merge.rc:2545 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugu\xEAs" -#: Merge.rc:2545 +#: Merge.rc:2551 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Island\xEAs" -#: Merge.rc:2546 +#: Merge.rc:2552 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreu" -#: Merge.rc:2547 +#: Merge.rc:2553 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Franc\xEAs do Canad\xE1" -#: Merge.rc:2548 +#: Merge.rc:2554 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS N\xF3rdico" -#: Merge.rc:2549 +#: Merge.rc:2555 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cir\xEDlico CIS 1" -#: Merge.rc:2550 +#: Merge.rc:2556 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grego 2" -#: Merge.rc:2556 +#: Merge.rc:2562 #, c-format msgid "Windows Thai" msgstr "Windows Tailand\xEAs" -#: Merge.rc:2557 +#: Merge.rc:2563 #, c-format msgid "Windows Japanese" msgstr "Windows Japon\xEAs" -#: Merge.rc:2558 +#: Merge.rc:2564 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chin\xEAs Simplificado" -#: Merge.rc:2559 +#: Merge.rc:2565 #, c-format msgid "Windows Korean" msgstr "Windows Coreano" -#: Merge.rc:2560 +#: Merge.rc:2566 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chin\xEAs Tradicional" -#: Merge.rc:2561 +#: Merge.rc:2567 #, c-format msgid "Windows Latin 2" msgstr "Windows Latim 2" -#: Merge.rc:2562 +#: Merge.rc:2568 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cir\xEDlico (Eslavo)" -#: Merge.rc:2563 +#: Merge.rc:2569 #, c-format msgid "Windows Latin 1" msgstr "Windows Latim 1" -#: Merge.rc:2564 +#: Merge.rc:2570 #, c-format msgid "Windows Greek" msgstr "Windows Grego" -#: Merge.rc:2565 +#: Merge.rc:2571 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latim 5 (Turco)" -#: Merge.rc:2566 +#: Merge.rc:2572 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreu" -#: Merge.rc:2567 +#: Merge.rc:2573 #, c-format msgid "Windows Arabic" msgstr "Windows \xC1rabe" -#: Merge.rc:2568 +#: Merge.rc:2574 #, c-format msgid "Windows Baltic Rim" msgstr "Windows da Margem do B\xE1ltico" -#: Merge.rc:2569 +#: Merge.rc:2575 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamita" -#: Merge.rc:2575 +#: Merge.rc:2581 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romano" -#: Merge.rc:2576 +#: Merge.rc:2582 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grego" -#: Merge.rc:2577 +#: Merge.rc:2583 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cir\xEDlico" -#: Merge.rc:2578 +#: Merge.rc:2584 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2579 +#: Merge.rc:2585 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh da Europa Central" -#: Merge.rc:2580 +#: Merge.rc:2586 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turco" -#: Merge.rc:2589 +#: Merge.rc:2595 #, c-format msgid "Approximates ISO-8859-2" msgstr "Se aproxima do ISO-8859-2" -#: Merge.rc:2592 +#: Merge.rc:2598 #, c-format msgid "Approximates ISO-8859-1" msgstr "Se aproxima do ISO-8859-1" -#: Merge.rc:2593 +#: Merge.rc:2599 #, c-format msgid "Approximates ISO-8859-7" msgstr "Se aproxima do ISO-8859-7" -#: Merge.rc:2594 +#: Merge.rc:2600 #, c-format msgid "Approximates ISO-8859-9" msgstr "Se aproxima do ISO-8859-9" -#: Merge.rc:2595 +#: Merge.rc:2601 #, c-format msgid "Approximates ISO-8859-8" msgstr "Se aproxima do ISO-8859-8" -#: Merge.rc:2601 +#: Merge.rc:2607 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2602 +#: Merge.rc:2608 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2603 +#: Merge.rc:2609 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2604 +#: Merge.rc:2610 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2606 +#: Merge.rc:2612 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2607 +#: Merge.rc:2613 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2608 +#: Merge.rc:2614 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2615 +#: Merge.rc:2621 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2616 +#: Merge.rc:2622 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2617 +#: Merge.rc:2623 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2618 +#: Merge.rc:2624 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2619 +#: Merge.rc:2625 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2620 +#: Merge.rc:2626 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2626 +#: Merge.rc:2632 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2628 +#: Merge.rc:2634 #, c-format msgid "Unpacker" msgstr "Desempacotador" -#: Merge.rc:2629 +#: Merge.rc:2635 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2630 +#: Merge.rc:2636 #, c-format msgid "Editor script" msgstr "Script do editor" -#: Merge.rc:2637 +#: Merge.rc:2643 #, c-format msgid "Save the left file" msgstr "Salvar o arquivo a esquerda" -#: Merge.rc:2638 +#: Merge.rc:2644 #, c-format msgid "Save the right file" msgstr "Salvar o arquivo a direita" -#: Merge.rc:2639 +#: Merge.rc:2645 #, c-format msgid "Save the left file with name..." msgstr "Salvar o arquivo a esquerda com o nome..." -#: Merge.rc:2640 +#: Merge.rc:2646 #, c-format msgid "Save the right file with name..." msgstr "Salvar o arquivo a direita com o nome..." -#: Merge.rc:2641 +#: Merge.rc:2647 #, c-format msgid "Change left side file/folder read-only status" msgstr "Mudar o status somente-leitura do arquivo/pasta do lado esquerdo" -#: Merge.rc:2642 +#: Merge.rc:2648 #, c-format msgid "Change right side file/folder read-only status" msgstr "Mudar o status somente-leitura do arquivo/pasta do lado direito" -#: Merge.rc:2643 +#: Merge.rc:2649 #, c-format msgid "Convert EOL to Windows mode" msgstr "Converter o EOL para o modo do Windows" -#: Merge.rc:2644 +#: Merge.rc:2650 #, c-format msgid "Convert EOL to Unix mode" msgstr "Converter o EOL para o modo do Unix" -#: Merge.rc:2645 +#: Merge.rc:2651 #, c-format msgid "Convert EOL to Mac mode" msgstr "Converter o EOL para o modo do Mac" -#: Merge.rc:2646 +#: Merge.rc:2652 #, c-format msgid "Switch between editing and merging modes" msgstr "Trocar entre os modos de edi\xE7\xE3o e uni\xE3o" -#: Merge.rc:2647 +#: Merge.rc:2653 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5412,12 +5416,12 @@ "Visualizar e ajustar as propriedades da codifica\xE7\xE3o do arquivo\n" "Propriedades da codifica\xE7\xE3o do arquivo" -#: Merge.rc:2648 +#: Merge.rc:2654 #, c-format msgid "Open and resolve conflict file" msgstr "Abrir e determinar o arquivo do conflito" -#: Merge.rc:2654 +#: Merge.rc:2660 #, c-format msgid "" "Select difference area in the current line\n" @@ -5426,7 +5430,7 @@ "Selecionar a \xE1rea da diferen\xE7a na linha atual\n" "Diferen\xE7a na Linha Atual" -#: Merge.rc:2655 +#: Merge.rc:2661 #, c-format msgid "" "Go to line or difference\n" @@ -5435,7 +5439,7 @@ "Ir para a linha ou diferen\xE7a\n" "Ir para (Ctrl+G)" -#: Merge.rc:2656 +#: Merge.rc:2662 #, c-format msgid "" "Set program options\n" @@ -5444,7 +5448,7 @@ "Definir as op\xE7\xF5es do programa\n" "Op\xE7\xF5es" -#: Merge.rc:2657 +#: Merge.rc:2663 #, c-format msgid "" "Refresh display\n" @@ -5453,37 +5457,37 @@ "Atualizar a exibi\xE7\xE3o\n" "Atualizar (F5)" -#: Merge.rc:2658 +#: Merge.rc:2664 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar as linhas selecionadas para a \xE1rea de transfer\xEAncia adicionando n\xFAmeros da linha ao come\xE7o da linha" -#: Merge.rc:2659 +#: Merge.rc:2665 #, c-format msgid "Refresh selected items" msgstr "Atualizar os itens selecionados" -#: Merge.rc:2660 +#: Merge.rc:2666 #, c-format msgid "Toggle bookmark" msgstr "Ativar o bookmark" -#: Merge.rc:2661 +#: Merge.rc:2667 #, c-format msgid "Go to next bookmark" msgstr "Ir para o bookmark seguinte" -#: Merge.rc:2662 +#: Merge.rc:2668 #, c-format msgid "Go to previous bookmark" msgstr "Ir para o bookmark anterior" -#: Merge.rc:2663 +#: Merge.rc:2669 #, c-format msgid "Clear all bookmarks" msgstr "Limpar todos os bookmarks" -#: Merge.rc:2669 +#: Merge.rc:2675 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5492,7 +5496,7 @@ "Exibe itens que s\xE3o exatamente os mesmos\n" "Mostrar Itens Id\xEAnticos" -#: Merge.rc:2670 +#: Merge.rc:2676 #, c-format msgid "" "Displays items that have differences\n" @@ -5501,7 +5505,7 @@ "Exibe itens que tem diferen\xE7as\n" "Mostrar Itens Diferentes" -#: Merge.rc:2671 +#: Merge.rc:2677 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5510,7 +5514,7 @@ "Exibe itens que existem apenas no lado esquerdo\n" "Mostrar Itens \xDAnicos a Esquerda" -#: Merge.rc:2672 +#: Merge.rc:2678 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5519,7 +5523,7 @@ "Exibe itens que existem apenas no lado direito\n" "Mostrar Itens \xDAnicos a Direita" -#: Merge.rc:2673 +#: Merge.rc:2679 #, c-format msgid "" "Displays binary files\n" @@ -5528,7 +5532,7 @@ "Exibe os arquivos bin\xE1rios\n" "Mostrar Arquivos Bin\xE1rios" -#: Merge.rc:2674 +#: Merge.rc:2680 #, c-format msgid "" "Displays skipped items\n" @@ -5537,7 +5541,7 @@ "Exibe os itens pulados\n" "Mostrar os Itens Pulados" -#: Merge.rc:2680 +#: Merge.rc:2686 #, c-format msgid "" "Select the font for the view\n" @@ -5546,7 +5550,7 @@ "Selecionar a fotne para a visualiza\xE7\xE3o\n" "Selecionar a Fonte para a Visualiza\xE7\xE3o" -#: Merge.rc:2681 +#: Merge.rc:2687 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5555,27 +5559,27 @@ "Reverter para usar a fonte padr\xE3o do sistema para a visualiza\xE7\xE3o\n" "Fonte Padr\xE3o" -#: Merge.rc:2682 +#: Merge.rc:2688 #, c-format msgid "Shows whitespace characters" msgstr "Mostrar os caracteres do espa\xE7o em branco" -#: Merge.rc:2683 +#: Merge.rc:2689 #, c-format msgid "Toggle Diff Pane" msgstr "Ativar o Painel das Diferen\xE7as" -#: Merge.rc:2684 +#: Merge.rc:2690 #, c-format msgid "Location pane shows overall picture from files" msgstr "O painel da localiza\xE7\xE3o mostra a fotografia global dos arquivos" -#: Merge.rc:2685 +#: Merge.rc:2691 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostrar o di\xE1logo das estat\xEDsticas de compara\xE7\xE3o das pastas" -#: Merge.rc:2686 +#: Merge.rc:2692 #, c-format msgid "" "Select the current user interface language\n" @@ -5584,7 +5588,7 @@ "Selecionar o idioma da interface do usu\xE1rio atual\n" "Idioma" -#: Merge.rc:2687 +#: Merge.rc:2693 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5593,12 +5597,12 @@ "Mostra as diferen\xE7as dentro das linhas com cores diferentes\n" "Mostrar a Diferen\xE7a das Linhas" -#: Merge.rc:2688 +#: Merge.rc:2694 #, c-format msgid "Swap the positions of the two panes" msgstr "Trocar as posi\xE7\xF5es dos dois pain\xE9is" -#: Merge.rc:2689 +#: Merge.rc:2695 #, c-format msgid "" "Shows line numbers\n" @@ -5607,7 +5611,7 @@ "Mostra os n\xFAmeros das linhas\n" "Mostrar os N\xFAmeros das Linhas" -#: Merge.rc:2690 +#: Merge.rc:2696 #, c-format msgid "" "Enable word wrap\n" @@ -5616,7 +5620,7 @@ "Ativar a organiza\xE7\xE3o das palavras\n" "Organizar as Linhas" -#: Merge.rc:2691 +#: Merge.rc:2697 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5625,22 +5629,22 @@ "Mostra as margens da sele\xE7\xE3o para ambos os pain\xE9is\n" "Mostrar as Margens da Sele\xE7\xE3o" -#: Merge.rc:2692 +#: Merge.rc:2698 #, c-format msgid "Increase text size" msgstr "Aumentar o tamanho do texto" -#: Merge.rc:2693 +#: Merge.rc:2699 #, c-format msgid "Decrease text size" msgstr "Diminuir o tamanho do texto" -#: Merge.rc:2694 +#: Merge.rc:2700 #, c-format msgid "Reset text zoom to default size" msgstr "Resetar o zoom do texto para o tamanho padr\xE3o" -#: Merge.rc:2700 +#: Merge.rc:2706 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5649,7 +5653,7 @@ "Rolar para o diferen\xE7a anterior\n" "Diferen\xE7a Anterior (Alt+Pra Cima)" -#: Merge.rc:2701 +#: Merge.rc:2707 #, c-format msgid "" "Scroll to the next difference\n" @@ -5658,7 +5662,7 @@ "Rolar para a diferen\xE7a seguinte\n" "Diferen\xE7a Seguinte (Alt+Pra baixo)" -#: Merge.rc:2702 +#: Merge.rc:2708 #, c-format msgid "" "Scroll to the first difference\n" @@ -5667,7 +5671,7 @@ "Rolar para a primeira diferen\xE7a\n" "Primeira Diferen\xE7a (Alt+Home)" -#: Merge.rc:2703 +#: Merge.rc:2709 #, c-format msgid "" "Scroll to the current difference\n" @@ -5676,7 +5680,7 @@ "Rolar para a diferen\xE7a atual\n" "Diferen\xE7a Atual (Alt+Enter)" -#: Merge.rc:2704 +#: Merge.rc:2710 #, c-format msgid "" "Scroll to the last difference\n" @@ -5685,7 +5689,7 @@ "Rolar para a \xFAltima diferen\xE7a\n" "\xDAltima Diferen\xE7a (Alt+End)" -#: Merge.rc:2705 +#: Merge.rc:2711 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5694,7 +5698,7 @@ "Copiar o texto selecionado para o arquivo da direita\n" "Copiar para a Direita (Alt+Direita)" -#: Merge.rc:2706 +#: Merge.rc:2712 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5703,7 +5707,7 @@ "Copiar o texto selecionado para o arquivo da esquerda\n" "Copiar para a Esquerda (Alt+Esquerda)" -#: Merge.rc:2707 +#: Merge.rc:2713 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5712,7 +5716,7 @@ "Copiar a diferen\xE7a para a direita e avan\xE7ar para a pr\xF3xima\n" "Copiar para a Direita e Avan\xE7ar (Ctrl+Alt+Direita)" -#: Merge.rc:2708 +#: Merge.rc:2714 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5721,7 +5725,7 @@ "Copiar a diferen\xE7a para a esquerda e avan\xE7ar para a pr\xF3xima\n" "Copiar para a Esquerda e Avan\xE7ar (Ctrl+Alt+Esquerda)" -#: Merge.rc:2709 +#: Merge.rc:2715 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5730,7 +5734,7 @@ "Copiar todas as diferen\xE7as para o arquivo da direita\n" "Tudo para a Direita" -#: Merge.rc:2710 +#: Merge.rc:2716 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5739,77 +5743,77 @@ "Copiar todas as diferen\xE7as para o arquivo da esquerda\n" "Tudo para a Esquerda" -#: Merge.rc:2711 +#: Merge.rc:2717 #, c-format msgid "Delete selected items from both directories" msgstr "Apagar os itens selecionados de ambos os diret\xF3rios" -#: Merge.rc:2712 +#: Merge.rc:2718 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparar o item selecionado (comparar o primeiro item se m\xFAltiplos itens est\xE3o selecionados)" -#: Merge.rc:2718 +#: Merge.rc:2724 #, c-format msgid "Select and reorder directory compare columns" msgstr "Selecionar e re-ordenar as colunas de compara\xE7\xE3o dos diret\xF3rios" -#: Merge.rc:2719 +#: Merge.rc:2725 #, c-format msgid "Generate a patch-file" msgstr "Gerar um arquivo-patch" -#: Merge.rc:2720 +#: Merge.rc:2726 #, c-format msgid "Select and modify filters" msgstr "Selecionar e modificar os filtros" -#: Merge.rc:2721 +#: Merge.rc:2727 #, c-format msgid "Generates a report from compare results" msgstr "Gera um relat\xF3rio dos resultados da compara\xE7\xE3o" -#: Merge.rc:2727 +#: Merge.rc:2733 #, c-format msgid "Shows a list of available plugins" msgstr "Mostra uma lista de plugins dispon\xEDveis" -#: Merge.rc:2728 +#: Merge.rc:2734 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "O usu\xE1rio seleciona o desempacotador (sem desempacotamento quando comparando diret\xF3rios)" -#: Merge.rc:2729 +#: Merge.rc:2735 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O desempacotador adaptado est\xE1 aplicado a ambos os arquivos (um arquivo s\xF3 precisa da extens\xE3o)" -#: Merge.rc:2730 +#: Merge.rc:2736 #, c-format msgid "Select an unpacker to edit this file" msgstr "Selecione um desempacotador para editar este arquivo" -#: Merge.rc:2731 +#: Merge.rc:2737 #, c-format msgid "No prediffer (normal)" msgstr "Sem prediffer (normal)" -#: Merge.rc:2732 +#: Merge.rc:2738 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2733 +#: Merge.rc:2739 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2734 +#: Merge.rc:2740 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarregar todos os plugins e recarreg\xE1-los (para desenvolvedores)" -#: Merge.rc:2740 +#: Merge.rc:2746 #, c-format msgid "" "Activates next visible file\n" @@ -5818,12 +5822,12 @@ "Ativa o pr\xF3ximo arquivo vis\xEDvel\n" "Ativar o pr\xF3ximo arquivo" -#: Merge.rc:2741 +#: Merge.rc:2747 #, c-format msgid "Closes all open windows" msgstr "Fecha todas as janelas abertas" -#: Merge.rc:2747 +#: Merge.rc:2753 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5832,22 +5836,22 @@ "Abre a Ajuda do WinMerge\n" "Ajuda do WinMerge" -#: Merge.rc:2748 +#: Merge.rc:2754 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Emite a info da vers\xE3o atual do WinMerge e configura\xE7\xE3o para o arquivo texto" -#: Merge.rc:2749 +#: Merge.rc:2755 #, c-format msgid "Display the GNU General Public License" msgstr "Exibe a GNU Licen\xE7a para o P\xFAblico em Geral" -#: Merge.rc:2750 +#: Merge.rc:2756 #, c-format msgid "Private Build: %1" msgstr "Build Privado: %1" -#: Merge.rc:2751 +#: Merge.rc:2757 #, c-format msgid "" "Opens the release notes document\n" @@ -5856,7 +5860,7 @@ "Abre o documento das notas do lan\xE7amento\n" "Notas do Lan\xE7amento" -#: Merge.rc:2752 +#: Merge.rc:2758 #, c-format msgid "" "Opens the translations website\n" @@ -5865,267 +5869,267 @@ "Abre o website das tradu\xE7\xF5es\n" "Tradu\xE7\xF5es" -#: Merge.rc:2758 +#: Merge.rc:2764 #, c-format msgid "Plugin Settings" msgstr "Configura\xE7\xF5es dos Plugins" -#: Merge.rc:2759 +#: Merge.rc:2765 #, c-format msgid "No prediffer" msgstr "Sem prediffer" -#: Merge.rc:2760 +#: Merge.rc:2766 #, c-format msgid "Prediff if possible" msgstr "Prediff se poss\xEDvel" -#: Merge.rc:2762 +#: Merge.rc:2768 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH n\xE3o achado - scripts .sct desativados" -#: Merge.rc:2763 +#: Merge.rc:2769 #, c-format msgid "<None>" msgstr "<Nenhum>" -#: Merge.rc:2764 +#: Merge.rc:2770 #, c-format msgid "<Automatic>" msgstr "<Autom\xE1tico>" -#: Merge.rc:2770 +#: Merge.rc:2776 #, c-format msgid "Open the file with registered application" msgstr "Abrir o arquivo com o aplicativo registrado" -#: Merge.rc:2771 +#: Merge.rc:2777 #, c-format msgid "Open the file with external editor" msgstr "Abrir o arquivo com o editor externo" -#: Merge.rc:2772 +#: Merge.rc:2778 #, c-format msgid "Open the file with a particular program" msgstr "Abrir o arquivo com um programa particular" -#: Merge.rc:2778 +#: Merge.rc:2784 #, c-format msgid "Do not display moved blocks" msgstr "N\xE3o exibir os blocos movidos" -#: Merge.rc:2779 +#: Merge.rc:2785 #, c-format msgid "Display all moved blocks" msgstr "Exibir todos os blocos movidos" -#: Merge.rc:2780 +#: Merge.rc:2786 #, c-format msgid "Display moved blocks only from current diff" msgstr "Exibir os blocos movidos apenas da diferen\xE7a atual" -#: Merge.rc:2781 +#: Merge.rc:2787 #, c-format msgid "Go to diff under cursor" msgstr "Ir para a diferen\xE7a sob o cursor" -#: Merge.rc:2782 +#: Merge.rc:2788 #, c-format msgid "G&oto Diff %1 of %2" msgstr "I&ir para a Diferen\xE7a %1 de %2" -#: Merge.rc:2783 +#: Merge.rc:2789 #, c-format msgid "G&oto Line %1" msgstr "I&r para a Linha %1" -#: Merge.rc:2789 +#: Merge.rc:2795 #, c-format msgid "Disabled" msgstr "Desativado" -#: Merge.rc:2790 +#: Merge.rc:2796 #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:2791 +#: Merge.rc:2797 #, c-format msgid "From MRU list" msgstr "Da lista da MRU" -#: Merge.rc:2797 +#: Merge.rc:2803 #, c-format msgid "No Highlighting" msgstr "Sem Destacamento" -#: Merge.rc:2798 +#: Merge.rc:2804 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2799 +#: Merge.rc:2805 #, c-format msgid "Basic" msgstr "B\xE1sico" -#: Merge.rc:2800 +#: Merge.rc:2806 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2801 +#: Merge.rc:2807 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2802 +#: Merge.rc:2808 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2803 +#: Merge.rc:2809 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2804 +#: Merge.rc:2810 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2805 +#: Merge.rc:2811 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2806 +#: Merge.rc:2812 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2807 +#: Merge.rc:2813 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2808 +#: Merge.rc:2814 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2809 +#: Merge.rc:2815 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2810 +#: Merge.rc:2816 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2811 +#: Merge.rc:2817 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2812 +#: Merge.rc:2818 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2813 +#: Merge.rc:2819 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2814 +#: Merge.rc:2820 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2815 +#: Merge.rc:2821 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2816 +#: Merge.rc:2822 #, c-format msgid "Portable Object" msgstr "Objeto Port\xE1til" -#: Merge.rc:2817 +#: Merge.rc:2823 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2818 +#: Merge.rc:2824 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2819 +#: Merge.rc:2825 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2820 +#: Merge.rc:2826 #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:2821 +#: Merge.rc:2827 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2822 +#: Merge.rc:2828 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2823 +#: Merge.rc:2829 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2824 +#: Merge.rc:2830 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2825 +#: Merge.rc:2831 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2826 +#: Merge.rc:2832 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2827 +#: Merge.rc:2833 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2828 +#: Merge.rc:2834 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2833 +#: Merge.rc:2839 #, c-format msgid "Hide the toolbar" msgstr "Esconder a barra de ferramentas" -#: Merge.rc:2834 +#: Merge.rc:2840 #, c-format msgid "Show small toolbar" msgstr "Mostrar barra de ferramentas pequena" -#: Merge.rc:2835 +#: Merge.rc:2841 #, c-format msgid "Show big toolbar" msgstr "Mostrar barra de ferramentas grande" Modified: trunk/Src/Languages/Bulgarian.po =================================================================== --- trunk/Src/Languages/Bulgarian.po 2008-10-23 15:42:19 UTC (rev 6031) +++ trunk/Src/Languages/Bulgarian.po 2008-10-23 15:48:19 UTC (rev 6032) @@ -720,7 +720,7 @@ msgstr "&\xD1\xEA\xF0\xE8\xEF\xF2\xEE\xE2\xE5" #: Merge.rc:370 -#: Merge.rc:2761 +#: Merge.rc:2767 #, c-format msgid "< Empty >" msgstr "< \xCF\xF0\xE0\xE7\xE5\xED >" @@ -1254,6 +1254,7 @@ msgstr "\xD1\xE8\xF1\xF2\xE5\xEC\xE0 \xE7\xE0 \xE2\xE5\xF0\xF1\xE8\xE8" #: Merge.rc:748 +#: Merge.rc:2051 #, c-format msgid "&Path to cleartool.exe:" msgstr "&\xCF\xFA\xF2 \xE4\xEE cleartool.exe:" @@ -2042,12 +2043,8 @@ #: Merge.rc:1277 #, c-format -msgid "" -"Detect codepage info for these files : .html, .rc, .xml \n" -"need to restart session" +msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -"\xC7\xE0\xF1\xE5\xF7\xE8 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0\xF2\xE0 \xE7\xE0 \xF1\xEB\xE5\xE4\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 : .html, .rc, .xml \n" -"\xE8\xE7\xE8\xF1\xEA\xE2\xE0 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5 \xED\xE0 \xF1\xE5\xF1\xE8\xFF\xF2\xE0" #: Merge.rc:1280 #, c-format @@ -2061,8 +2058,8 @@ #: Merge.rc:1284 #, c-format -msgid "Custom codepage :" -msgstr "\xCF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 :" +msgid "Custom codepage:" +msgstr "" #: Merge.rc:1292 #, c-format @@ -3338,7 +3335,7 @@ msgstr "\xD0\xE0\xE7\xEC\xE5\xF0" #: Merge.rc:2014 -#: Merge.rc:2625 +#: Merge.rc:2631 #, c-format msgid "Name" msgstr "\xC8\xEC\xE5" @@ -3359,7 +3356,7 @@ msgstr "" #: Merge.rc:2018 -#: Merge.rc:2627 +#: Merge.rc:2633 #, c-format msgid "Description" msgstr "\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5" @@ -3455,15 +3452,10 @@ msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2051 -#, c-format -msgid "&Path to cleartool.exe :" -msgstr "&\xCF\xFA\xF2 \xE4\xEE cleartool.exe :" - #: Merge.rc:2052 #, c-format -msgid "&Path to SS.EXE :" -msgstr "&\xCF\xFA\xF2 \xE4\xEE SS.EXE :" +msgid "&Path to SS.EXE:" +msgstr "" #: Merge.rc:2058 #, c-format @@ -3880,7 +3872,7 @@ " \xCC\xEE\xEB\xFF, \xEF\xF0\xEE\xE2\xE5\xF0\xE5\xF2\xE5 \xEA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF\xF2\xE0 \xED\xE0 \xE8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xED\xE8\xFF \xE8\xE7\xE3\xEB\xE5\xE4." #: Merge.rc:2169 -#: Merge.rc:2609 +#: Merge.rc:2615 #, c-format msgid "None" msgstr "\xCD\xFF\xEC\xE0" @@ -4312,7 +4304,7 @@ msgstr "\xD0\xE0\xE7\xEB\xE8\xEA\xE8" #: Merge.rc:2300 -#: Merge.rc:2605 +#: Merge.rc:2611 #, c-format msgid "Binary" msgstr "\xC4\xE2\xEE\xE8\xF7\xE5\xED" @@ -4382,177 +4374,187 @@ msgid "Error" msgstr "\xC3\xF0\xE5\xF8\xEA\xE0" +#: Merge.rc:2321 +#, c-format +msgid "Text files are identical" +msgstr "" + #: Merge.rc:2326 #, c-format +msgid "Text files are different" +msgstr "" + +#: Merge.rc:2332 +#, c-format msgid "Elapsed time: %ld ms" msgstr "\xCE\xF1\xF2\xE0\xE2\xE0\xF9\xEE \xE2\xF0\xE5\xEC\xE5: %ld ms" -#: Merge.rc:2327 +#: Merge.rc:2333 #, c-format msgid "1 item selected" msgstr "1 \xE8\xE7\xE1\xF0\xE0\xED \xEE\xE1\xE5\xEA\xF2" -#: Merge.rc:2328 +#: Merge.rc:2334 #, c-format msgid "%1 items selected" msgstr "%1 \xE8\xE7\xE1\xF0\xE0\xED\xE8 \xEE\xE1\xE5\xEA\xF2\xE0" -#: Merge.rc:2334 +#: Merge.rc:2340 #, c-format msgid "Filename or folder name." msgstr "\xC8\xEC\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xE8\xEB\xE8 \xF4\xE0\xE9\xEB\xE0." -#: Merge.rc:2335 +#: Merge.rc:2341 #, c-format msgid "Subfolder name when subfolders are included." msgstr "\xC8\xEC\xE5 \xED\xE0 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE0\xF2\xE0, \xEA\xEE\xE3\xE0\xF2\xEE \xF1\xE0 \xE2\xEA\xEB\xFE\xF7\xE5\xED\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8\xF2\xE5." -#: Merge.rc:2336 +#: Merge.rc:2342 #, c-format msgid "Comparison result, long form." msgstr "\xD0\xE5\xE7\xF3\xEB\xF2\xE0\xF2 \xED\xE0 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5\xF2\xEE, \xE4\xFA\xEB\xE3\xE0 \xF4\xEE\xF0\xEC\xE0." -#: Merge.rc:2337 +#: Merge.rc:2343 #, c-format msgid "Left side modification date." msgstr "\xC4\xE0\xF2\xE0 \xED\xE0 \xEF\xF0\xEE\xEC\xFF\xED\xE0 \xED\xE0 \xEB\xFF\xE2\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2338 +#: Merge.rc:2344 #, c-format msgid "Right side modification date." msgstr "\xC4\xE0\xF2\xE0 \xED\xE0 \xEF\xF0\xEE\xEC\xFF\xED\xE0 \xED\xE0 \xE4\xFF\xF1\xED\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2339 +#: Merge.rc:2345 #, c-format msgid "File's extension." msgstr "\xD0\xE0\xE7\xF8\xE8\xF0\xE5\xED\xE8\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0." -#: Merge.rc:2340 +#: Merge.rc:2346 #, c-format msgid "Left file size in bytes." msgstr "\xD0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xEB\xE5\xE2\xE8\xFF \xF4\xE0\xE9\xEB \xE2 \xE1\xE0\xE9\xF2\xE0." -#: Merge.rc:2341 +#: Merge.rc:2347 #, c-format msgid "Right file size in bytes." msgstr "\xD0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xE4\xE5\xF1\xED\xE8\xFF \xF4\xE0\xE9\xEB \xE2 \xE1\xE0\xE9\xF2\xE0." -#: Merge.rc:2342 +#: Merge.rc:2348 #, c-format msgid "Left file size abbreviated." msgstr "\xD1\xFA\xEA\xF0\xE0\xF2\xE5\xED \xF0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xE2 \xEB\xFF\xE2\xEE." -#: Merge.rc:2343 +#: Merge.rc:2349 #, c-format msgid "Right file size abbreviated." msgstr "\xD1\xFA\xEA\xF0\xE0\xF2\xE5\xED \xF0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xE2 \xE4\xFF\xF1\xED\xEE." -#: Merge.rc:2349 +#: Merge.rc:2355 #, c-format msgid "Left side creation time." msgstr "\xC4\xE0\xF2\xE0 \xED\xE0 \xF1\xFA\xE7\xE4\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xEB\xFF\xE2\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2350 +#: Merge.rc:2356 #, c-format msgid "Right side creation time." msgstr "\xC4\xE0\xF2\xE0 \xED\xE0 \xF1\xFA\xE7\xE4\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xE4\xFF\xF1\xED\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2351 +#: Merge.rc:2357 #, c-format msgid "Tells which side has newer modification date." msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xEA\xEE\xFF \xF1\xF2\xF0\xE0\xED\xE0 \xE8\xEC\xE0 \xEF\xEE-\xED\xEE\xE2\xE0 \xE4\xE0\xF2\xE0 \xED\xE0 \xEF\xF0\xEE\xEC\xFF\xED\xE0." -#: Merge.rc:2352 +#: Merge.rc:2358 #, c-format msgid "Left side file version, only for some filetypes." msgstr "\xC2\xE5\xF0\xF1\xE8\xFF \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xEE\xF2 \xEB\xFF\xE2\xEE, \xF1\xE0\xEC\xEE \xE7\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xEE\xF2 \xE5\xE4\xED\xE0\xEA\xFA\xE2 \xF2\xE8\xEF." -#: Merge.rc:2353 +#: Merge.rc:2359 #, c-format msgid "Right side file version, only for some filetypes." msgstr "\xC2\xE5\xF0\xF1\xE8\xFF \xED\xE0 \xF4\xE0\xE9\xEB\xE0 \xEE\xF2 \xE4\xFF\xF1\xED\xEE, \xF1\xE0\xEC\xEE \xE7\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xEE\xF2 \xE5\xE4\xED\xE0\xEA\xFA\xE2 \xF2\xE8\xEF." -#: Merge.rc:2354 +#: Merge.rc:2360 #, c-format msgid "Short comparison result." msgstr "\xCA\xF0\xE0\xF2\xEA\xE8 \xF0\xE5\xE7\xF3\xEB\xF2\xE0\xF2\xE8 \xED\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5." -#: Merge.rc:2355 +#: Merge.rc:2361 #, c-format msgid "Left side attributes." msgstr "\xC0\xF2\xF0\xE8\xE1\xF3\xF2\xE8 \xED\xE0 \xEB\xFF\xE2\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2356 +#: Merge.rc:2362 #, c-format msgid "Right side attributes." msgstr "\xC0\xF2\xF0\xE8\xE1\xF3\xF2\xE8 \xED\xE0 \xE4\xFF\xF1\xED\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2357 +#: Merge.rc:2363 #, c-format msgid "Left side file EOL type" msgstr "EOL \xF2\xE8\xEF \xED\xE0 \xEB\xE5\xE2\xE8\xFF \xF4\xE0\xE9\xEB" -#: Merge.rc:2358 +#: Merge.rc:2364 #, c-format msgid "Right side file EOL type" msgstr "EOL \xF2\xE8\xEF \xED\xE0 \xE4\xE5\xF1\xED\xE8\xFF \xF4\xE0\xE9\xEB" -#: Merge.rc:2364 +#: Merge.rc:2370 #, c-format msgid "Left side encoding." msgstr "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xED\xE0 \xEB\xFF\xE2\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2365 +#: Merge.rc:2371 #, c-format msgid "Right side encoding." msgstr "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xED\xE0 \xE4\xFF\xF1\xED\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0." -#: Merge.rc:2366 +#: Merge.rc:2372 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "\xC1\xF0\xEE\xE9 \xED\xE0 \xE8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xED\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xE2\xFA\xE2 \xF4\xE0\xE9\xEB. \xD2\xE5\xE7\xE8 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xF1\xE0 \xE8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xED\xE8 \xEE\xF2 WinMerge \xE8 \xED\xE5 \xEC\xEE\xE3\xE0\xF2 \xE4\xE0 \xE1\xFA\xE4\xE0\xF2 \xF1\xEC\xE5\xF1\xE5\xED\xE8." -#: Merge.rc:2367 +#: Merge.rc:2373 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "\xC1\xF0\xEE\xE9 \xED\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2\xFA\xE2 \xF4\xE0\xE9\xEB. \xD2\xEE\xE7\xE8 \xE1\xF0\xEE\xE9 \xED\xE5 \xE2\xEA\xEB\xFE\xF7\xE2\xE0 \xE8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xED\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8." -#: Merge.rc:2368 +#: Merge.rc:2374 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "\xCF\xEE\xEA\xE0\xE6\xE8 \xE7\xE2\xE5\xE7\xE4\xE8\xF7\xEA\xE0 (*), \xE0\xEA\xEE \xF4\xE0\xE9\xEB\xFA\xF2 \xE5 \xE4\xE2\xEE\xE8\xF7\xE5\xED." -#: Merge.rc:2374 +#: Merge.rc:2380 #, c-format msgid "Compare %1 with %2" msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 %1 \xF1 %2" -#: Merge.rc:2375 +#: Merge.rc:2381 #, c-format msgid "Comma-separated list" msgstr "\xD1\xEF\xE8\xF1\xFA\xEA, \xF0\xE0\xE7\xE4\xE5\xEB\xE5\xED \xF1\xFA\xF1 \xE7\xE0\xEF\xE5\xF2\xE0\xFF" -#: Merge.rc:2376 +#: Merge.rc:2382 #, c-format msgid "Tab-separated list" msgstr "\xD1\xEF\xE8\xF1\xFA\xEA, \xF0\xE0\xE7\xE4\xE5\xEB\xE5\xED \xF1 \xF2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF" -#: Merge.rc:2377 +#: Merge.rc:2383 #, c-format msgid "Simple HTML" msgstr "\xD7\xE8\xF1\xF2 HTML" -#: Merge.rc:2378 +#: Merge.rc:2384 #, c-format msgid "Simple XML" msgstr "\xD7\xE8\xF1\xF2 XML" -#: Merge.rc:2380 +#: Merge.rc:2386 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "\xD4\xE0\xE9\xEB\xFA\xF2 \xF1 \xEE\xF2\xF7\xE5\xF2\xE0 \xE2\xE5\xF7\xE5 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0. \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xE7\xE0\xEC\xE5\xED\xE8\xF2\xE5 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9\xE8\xFF \xF4\xE0\xE9\xEB?" -#: Merge.rc:2381 +#: Merge.rc:2387 #, c-format msgid "" "Error creating the report:\n" @@ -4561,32 +4563,32 @@ "\xC3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xF1\xFA\xE7\xE4\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xEE\xF2\xF7\xE5\xF2\xE0:\n" "%1" -#: Merge.rc:2382 +#: Merge.rc:2388 #, c-format msgid "The report has been created successfully." msgstr "\xCE\xF2\xF7\xE5\xF2\xFA\xF2 \xE1\xE5\xF8\xE5 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xED \xF3\xF1\xEF\xE5\xF8\xED\xEE." -#: Merge.rc:2388 +#: Merge.rc:2394 #, c-format msgid "The same file is opened in both panels." msgstr "\xC5\xE4\xED\xE0\xEA\xE2\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xEE\xF2\xE2\xEE\xF0\xE5\xED\xE8 \xE2 \xE4\xE2\xE0\xF2\xE0 \xEF\xE0\xED\xE5\xEB\xE0." -#: Merge.rc:2389 +#: Merge.rc:2395 #, c-format msgid "The selected files are identical." msgstr "\xC8\xE7\xE1\xF0\xE0\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xE5\xE4\xED\xE0\xEA\xE2\xE8." -#: Merge.rc:2390 +#: Merge.rc:2396 #, c-format msgid "An error occurred while comparing the files." msgstr "\xCF\xEE\xEB\xF3\xF7\xE8 \xF1\xE5 \xE3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5\xF2\xE5." -#: Merge.rc:2391 +#: Merge.rc:2397 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "\xCD\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xF1\xFA\xE7\xE4\xE0\xE4\xE0\xF2 \xE2\xF0\xE5\xEC\xE5\xED\xED\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5. \xCF\xF0\xEE\xE2\xE5\xF0\xE5\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5 \xE7\xE0 \xE2\xF0\xE5\xEC\xE5\xED\xED\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5." -#: Merge.rc:2392 +#: Merge.rc:2398 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4601,32 +4603,32 @@ "\n" "\xC1\xE5\xEB\xE5\xE6\xEA\xE0: \xC0\xEA\xEE \xE8\xF1\xEA\xE0\xF2\xE5 \xE4\xE0 \xF1\xF7\xE8\xF2\xE0\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xE2\xFA\xF0\xED\xE0\xF2\xE8 \xF2\xE8\xEF\xEE\xE2\xE5 \xEA\xE0\xF2\xEE \xE5\xE4\xED\xE0\xEA\xE2\xE8, \xE7\xE0\xE4\xE0\xE9\xF2\xE5 \xEE\xEF\xF6\xE8\xFF\xF2\xE0 '\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xE2\xFA\xF0\xED\xE0\xF2\xE8 \xF2\xE8\xEF\xEE\xE2\xE5..' \xE2 \xF0\xE0\xE7\xE4\xE5\xEB\xE0 \xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xEE\xF2 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0 \xF1 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5 (\xED\xE0\xEC\xE8\xF0\xE0 \xF1\xE5 \xEE\xF2 \xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xED\xE5/\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8)." -#: Merge.rc:2393 +#: Merge.rc:2399 #, c-format msgid "The EOL are of different types (Windows/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 "\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?" -#: Merge.rc:2394 +#: Merge.rc:2400 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "\xC2\xFA\xE7\xED\xE8\xEA\xED\xE0 \xE3\xF0\xE5\xF8\xEA\xE0 \xE4\xEE\xEA\xE0\xF2\xEE \xF1\xE5 \xEF\xF0\xEE\xE2\xE5\xF0\xFF\xE2\xE0\xF8\xE5 \xE7\xE0 \xEF\xF0\xE5\xE4\xE2\xE0\xF0\xE8\xF2\xE5\xEB\xED\xE8 \xE3\xF0\xE5\xF8\xEA\xE8 \xF4\xE0\xE9\xEB\xFA\xF2 '%1' \xF1 \xE4\xEE\xE1\xE0\xE2\xEA\xE0\xF2\xE0 '%2'. \xCF\xF0\xE5\xE4\xE2\xE0\xF0\xE8\xF2\xE5\xEB\xED\xEE\xF2\xEE \xEF\xF0\xEE\xE2\xE5\xF0\xFF\xE2\xE0\xED\xE5 \xE7\xE0 \xE3\xF0\xE5\xF8\xEA\xE8 \xED\xE5 \xF1\xE5 \xEF\xF0\xE8\xEB\xE0\xE3\xE0 \xE2\xE5\xF7\xE5." -#: Merge.rc:2395 +#: Merge.rc:2401 #, c-format msgid "The selected folder is invalid." msgstr "\xC8\xE7\xE1\xF0\xE0\xED\xE0\xF2\xE0 \xEF\xE0\xEF\xEA\xE0 \xE5 \xED\xE5\xE2\xE0\xEB\xE8\xE4\xED\xE0." -#: Merge.rc:2396 +#: Merge.rc:2402 #, c-format msgid "Cannot open a binary file to editor." msgstr "\xCD\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8 \xE4\xE2\xEE\xE8\xF7\xE5\xED \xF4\xE0\xE9\xEB \xF1 \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0." -#: Merge.rc:2397 +#: Merge.rc:2403 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n\n\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n%1\n\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?" -#: Merge.rc:2403 +#: Merge.rc:2409 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4637,132 +4639,132 @@ "\xCF\xEE\xEA\xE0\xE7\xE2\xE0\xED\xE5\xF2\xEE \xED\xE0 \xE2\xF1\xE5\xEA\xE8 \xF4\xE0\xE9\xEB \xF1 \xED\xE5\xE3\xEE\xE2\xE0\xF2\xE0 \xEA\xEE\xE4\... [truncated message content] |
From: <ki...@us...> - 2008-11-20 17:49:30
|
Revision: 6110 http://winmerge.svn.sourceforge.net/winmerge/?rev=6110&view=rev Author: kimmov Date: 2008-11-20 17:49:27 +0000 (Thu, 20 Nov 2008) Log Message: ----------- Update translation PO files for latest English.POT file. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/French.po trunk/Src/Languages/Galician.po trunk/Src/Languages/German.po trunk/Src/Languages/Greek.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Japanese.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po trunk/Src/Languages/Ukrainian.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2008-11-20 17:23:19 UTC (rev 6109) +++ trunk/Src/Languages/Brazilian.po 2008-11-20 17:49:27 UTC (rev 6110) @@ -391,7 +391,7 @@ #: Merge.rc:175 #: Merge.rc:296 #: Merge.rc:484 -#: Merge.rc:1921 +#: Merge.rc:1923 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -722,7 +722,7 @@ msgstr "&Scripts" #: Merge.rc:370 -#: Merge.rc:2767 +#: Merge.rc:2776 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -924,15 +924,15 @@ msgstr "&Apagar" #: Merge.rc:523 -#: Merge.rc:1141 -#: Merge.rc:1523 +#: Merge.rc:1143 +#: Merge.rc:1525 #, c-format msgid "&Left" msgstr "&Esquerda" #: Merge.rc:524 -#: Merge.rc:1143 -#: Merge.rc:1526 +#: Merge.rc:1145 +#: Merge.rc:1528 #, c-format msgid "&Right" msgstr "&Direita" @@ -1084,17 +1084,17 @@ #: Merge.rc:674 #: Merge.rc:706 -#: Merge.rc:796 -#: Merge.rc:982 -#: Merge.rc:1060 -#: Merge.rc:1089 -#: Merge.rc:1099 -#: Merge.rc:1265 -#: Merge.rc:1329 -#: Merge.rc:1342 -#: Merge.rc:1434 -#: Merge.rc:1449 -#: Merge.rc:1671 +#: Merge.rc:798 +#: Merge.rc:984 +#: Merge.rc:1062 +#: Merge.rc:1091 +#: Merge.rc:1101 +#: Merge.rc:1267 +#: Merge.rc:1331 +#: Merge.rc:1344 +#: Merge.rc:1436 +#: Merge.rc:1451 +#: Merge.rc:1673 #, c-format msgid "OK" msgstr "OK" @@ -1110,39 +1110,39 @@ msgstr "Selecionar Arquivos ou Pastas" #: Merge.rc:685 -#: Merge.rc:1600 +#: Merge.rc:1602 #, c-format msgid "&Left:" msgstr "&Esquerda:" #: Merge.rc:689 #: Merge.rc:750 -#: Merge.rc:1003 -#: Merge.rc:1025 +#: Merge.rc:1005 +#: Merge.rc:1027 #, c-format msgid "&Browse..." msgstr "&Procurar..." #: Merge.rc:690 -#: Merge.rc:1604 +#: Merge.rc:1606 #, c-format msgid "&Right:" msgstr "&Direita:" #: Merge.rc:694 -#: Merge.rc:1036 +#: Merge.rc:1038 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." #: Merge.rc:695 -#: Merge.rc:1608 +#: Merge.rc:1610 #, c-format msgid "&Filter:" msgstr "&Filtro:" #: Merge.rc:698 -#: Merge.rc:1610 +#: Merge.rc:1612 #, c-format msgid "Select..." msgstr "Selecionar..." @@ -1158,7 +1158,7 @@ msgstr "&Selecionar..." #: Merge.rc:703 -#: Merge.rc:1611 +#: Merge.rc:1613 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" @@ -1170,25 +1170,25 @@ #: Merge.rc:707 #: Merge.rc:737 -#: Merge.rc:797 -#: Merge.rc:827 -#: Merge.rc:859 -#: Merge.rc:869 -#: Merge.rc:1061 -#: Merge.rc:1090 -#: Merge.rc:1100 -#: Merge.rc:1151 -#: Merge.rc:1266 -#: Merge.rc:1343 -#: Merge.rc:1435 -#: Merge.rc:1450 -#: Merge.rc:1672 +#: Merge.rc:799 +#: Merge.rc:829 +#: Merge.rc:861 +#: Merge.rc:871 +#: Merge.rc:1063 +#: Merge.rc:1092 +#: Merge.rc:1102 +#: Merge.rc:1153 +#: Merge.rc:1268 +#: Merge.rc:1345 +#: Merge.rc:1437 +#: Merge.rc:1452 +#: Merge.rc:1674 #, c-format msgid "Cancel" msgstr "Cancelar" #: Merge.rc:708 -#: Merge.rc:1344 +#: Merge.rc:1346 #, c-format msgid "Help" msgstr "Ajuda" @@ -1229,7 +1229,7 @@ msgstr "Link para o projeto VSS Destino" #: Merge.rc:733 -#: Merge.rc:874 +#: Merge.rc:876 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" @@ -1240,7 +1240,7 @@ msgstr "Veja Isso" #: Merge.rc:736 -#: Merge.rc:870 +#: Merge.rc:872 #, c-format msgid "Save As..." msgstr "Salvar Como..." @@ -1256,13 +1256,13 @@ msgstr "&Sistema de Vers\xF5es:" #: Merge.rc:748 -#: Merge.rc:2051 +#: Merge.rc:2053 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" #: Merge.rc:755 -#: Merge.rc:1929 +#: Merge.rc:1931 #, c-format msgid "General" msgstr "Geral" @@ -1304,746 +1304,751 @@ #: Merge.rc:775 #, c-format +msgid "Enable Shell &Context Menu" +msgstr "" + +#: Merge.rc:777 +#, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-Conclus\xE3o do di\xE1logo-Abrir:" -#: Merge.rc:778 +#: Merge.rc:780 #, c-format msgid "Enable multiple compare windows for" msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para" -#: Merge.rc:780 -#: Merge.rc:1623 +#: Merge.rc:782 +#: Merge.rc:1625 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" -#: Merge.rc:782 -#: Merge.rc:1625 +#: Merge.rc:784 +#: Merge.rc:1627 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" -#: Merge.rc:784 +#: Merge.rc:786 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o bot\xE3o Resetar para tornar todas as caixas de mensagens vis\xEDveis de novo." -#: Merge.rc:786 +#: Merge.rc:788 #, c-format msgid "Reset" msgstr "Resetar" -#: Merge.rc:793 +#: Merge.rc:795 #, c-format msgid "Language" msgstr "Idiomas" -#: Merge.rc:800 +#: Merge.rc:802 #, c-format msgid "Available languages:" msgstr "Idiomas dispon\xEDveis:" -#: Merge.rc:806 +#: Merge.rc:808 #, c-format msgid "Find" msgstr "Achar" -#: Merge.rc:809 -#: Merge.rc:836 +#: Merge.rc:811 +#: Merge.rc:838 #, c-format msgid "Fi&nd what:" msgstr "Ac&har:" -#: Merge.rc:812 -#: Merge.rc:842 +#: Merge.rc:814 +#: Merge.rc:844 #, c-format msgid "Match &whole word only" msgstr "Combinar &apenas palavras inteiras" -#: Merge.rc:814 -#: Merge.rc:844 +#: Merge.rc:816 +#: Merge.rc:846 #, c-format msgid "Match &case" msgstr "Combinar &com o caso sensitivo" -#: Merge.rc:816 -#: Merge.rc:846 +#: Merge.rc:818 +#: Merge.rc:848 #, c-format msgid "Regular &expression" msgstr "Express&\xE3o regular" -#: Merge.rc:818 +#: Merge.rc:820 #, c-format msgid "D&on't wrap end of file" msgstr "N&\xE3o organizar o final do arquivo" -#: Merge.rc:821 +#: Merge.rc:823 #, c-format msgid "Direction" msgstr "Dire\xE7\xE3o" -#: Merge.rc:822 +#: Merge.rc:824 #, c-format msgid "&Up" msgstr "&Pra cima" -#: Merge.rc:824 +#: Merge.rc:826 #, c-format msgid "&Down" msgstr "&Pra baixo" -#: Merge.rc:826 -#: Merge.rc:856 +#: Merge.rc:828 +#: Merge.rc:858 #, c-format msgid "&Find Next" msgstr "&Achar o Pr\xF3ximo" -#: Merge.rc:833 +#: Merge.rc:835 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:839 +#: Merge.rc:841 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:848 +#: Merge.rc:850 #, c-format msgid "&Don't wrap end of file" msgstr "&N\xE3o organizar o final do arquivo" -#: Merge.rc:851 +#: Merge.rc:853 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:852 +#: Merge.rc:854 #, c-format msgid "&Selection" msgstr "&Sele\xE7\xE3o" -#: Merge.rc:854 +#: Merge.rc:856 #, c-format msgid "Wh&ole file" msgstr "No &arquivo inteiro" -#: Merge.rc:857 +#: Merge.rc:859 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:858 +#: Merge.rc:860 #, c-format msgid "Replace &All" msgstr "Substituir &Tudo" -#: Merge.rc:865 -#: Merge.rc:2172 +#: Merge.rc:867 +#: Merge.rc:2174 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:868 +#: Merge.rc:870 #, c-format msgid "CheckOut" msgstr "Veja Isso" -#: Merge.rc:873 -#: Merge.rc:1185 +#: Merge.rc:875 +#: Merge.rc:1187 #, c-format msgid "Comments" msgstr "Coment\xE1rios" -#: Merge.rc:876 +#: Merge.rc:878 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ap\xF3s o checkout" -#: Merge.rc:882 +#: Merge.rc:884 #, c-format msgid "Linefilters" msgstr "Filtros das linhas" -#: Merge.rc:885 +#: Merge.rc:887 #, c-format msgid "Enable Line Filters" msgstr "Ativar os Filtros das Linhas" -#: Merge.rc:888 +#: Merge.rc:890 #, c-format msgid "Regular Expressions (one per line):" msgstr "Express\xF5es Regulares (uma por linha):" -#: Merge.rc:895 +#: Merge.rc:897 #, c-format msgid "Save" msgstr "Salvar" -#: Merge.rc:896 +#: Merge.rc:898 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:897 +#: Merge.rc:899 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:898 +#: Merge.rc:900 #, c-format msgid "Remove" msgstr "Remover" -#: Merge.rc:903 -#: Merge.rc:1932 +#: Merge.rc:905 +#: Merge.rc:1934 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:906 +#: Merge.rc:908 #, c-format msgid "Difference:" msgstr "Diferen\xE7a:" -#: Merge.rc:910 +#: Merge.rc:912 #, c-format msgid "Selected Difference:" msgstr "Diferen\xE7a Selecionada:" -#: Merge.rc:914 -#: Merge.rc:1575 +#: Merge.rc:916 +#: Merge.rc:1577 #, c-format msgid "Background" msgstr "2\xBA Plano" -#: Merge.rc:915 +#: Merge.rc:917 #, c-format msgid "Deleted" msgstr "Apagado" -#: Merge.rc:928 -#: Merge.rc:1370 -#: Merge.rc:1576 +#: Merge.rc:930 +#: Merge.rc:1372 +#: Merge.rc:1578 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:932 +#: Merge.rc:934 #, c-format msgid "Ignored Difference:" msgstr "Diferen\xE7a Ignorada:" -#: Merge.rc:942 +#: Merge.rc:944 #, c-format msgid "Moved:" msgstr "Movido:" -#: Merge.rc:952 +#: Merge.rc:954 #, c-format msgid "Selected Moved:" msgstr "Selecionado o Movido:" -#: Merge.rc:959 +#: Merge.rc:961 #, c-format msgid "Word Difference:" msgstr "Diferen\xE7a das Palavras:" -#: Merge.rc:966 +#: Merge.rc:968 #, c-format msgid "Selected Word Diff:" msgstr "Diferen\xE7a das Palavras Selecionadas:" -#: Merge.rc:973 -#: Merge.rc:1059 -#: Merge.rc:1088 -#: Merge.rc:1188 -#: Merge.rc:1416 +#: Merge.rc:975 +#: Merge.rc:1061 +#: Merge.rc:1090 +#: Merge.rc:1190 +#: Merge.rc:1418 #, c-format msgid "Defaults" msgstr "Padr\xF5es" -#: Merge.rc:979 -#: Merge.rc:1358 -#: Merge.rc:1564 +#: Merge.rc:981 +#: Merge.rc:1360 +#: Merge.rc:1566 #, c-format msgid "Dialog" msgstr "Di\xE1logo" -#: Merge.rc:989 -#: Merge.rc:1935 +#: Merge.rc:991 +#: Merge.rc:1937 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:992 +#: Merge.rc:994 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:994 +#: Merge.rc:996 #, c-format msgid "Integration" msgstr "Integra\xE7\xE3o" -#: Merge.rc:995 +#: Merge.rc:997 #, c-format msgid "&Add to explorer context menu" msgstr "&Adicionar ao menu de contexto do explorer" -#: Merge.rc:997 +#: Merge.rc:999 #, c-format msgid "E&nable advanced menu" msgstr "A&tivar o menu avan\xE7ado" -#: Merge.rc:999 +#: Merge.rc:1001 #, c-format msgid "In&clude subfolders by default" msgstr "In&cluir as sub-pastas por padr\xE3o" -#: Merge.rc:1001 +#: Merge.rc:1003 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:1004 +#: Merge.rc:1006 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:1006 +#: Merge.rc:1008 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:1007 +#: Merge.rc:1009 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos tempor\xE1rios" -#: Merge.rc:1008 +#: Merge.rc:1010 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta tempor\xE1ria do sistema" -#: Merge.rc:1010 +#: Merge.rc:1012 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1013 -#: Merge.rc:1029 +#: Merge.rc:1015 +#: Merge.rc:1031 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:1019 +#: Merge.rc:1021 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1022 +#: Merge.rc:1024 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1026 +#: Merge.rc:1028 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1030 +#: Merge.rc:1032 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1031 +#: Merge.rc:1033 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1033 +#: Merge.rc:1035 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1037 +#: Merge.rc:1039 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1038 +#: Merge.rc:1040 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1041 +#: Merge.rc:1043 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1044 +#: Merge.rc:1046 #, c-format msgid "W&hitespaces" msgstr "E&spa\xE7os em branco" -#: Merge.rc:1045 +#: Merge.rc:1047 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:1047 +#: Merge.rc:1049 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudan\xE7as" -#: Merge.rc:1049 +#: Merge.rc:1051 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:1051 +#: Merge.rc:1053 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1053 +#: Merge.rc:1055 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:1055 +#: Merge.rc:1057 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1057 +#: Merge.rc:1059 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1079 +#: Merge.rc:1081 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1085 +#: Merge.rc:1087 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1086 +#: Merge.rc:1088 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1096 +#: Merge.rc:1098 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1101 +#: Merge.rc:1103 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1104 +#: Merge.rc:1106 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o" -#: Merge.rc:1107 +#: Merge.rc:1109 #, c-format msgid "Extensions list:" msgstr "Lista das extens\xF5es:" -#: Merge.rc:1108 +#: Merge.rc:1110 #, c-format msgid "Description:" msgstr "Descri\xE7\xE3o:" -#: Merge.rc:1119 +#: Merge.rc:1121 #, c-format msgid " Folder Compare Progress" msgstr " Progresso da Compara\xE7\xE3o das Pastas" -#: Merge.rc:1122 -#: Merge.rc:1882 +#: Merge.rc:1124 +#: Merge.rc:1884 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1127 +#: Merge.rc:1129 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1128 +#: Merge.rc:1130 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1129 +#: Merge.rc:1131 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1135 +#: Merge.rc:1137 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1138 +#: Merge.rc:1140 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1140 +#: Merge.rc:1142 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1145 +#: Merge.rc:1147 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1146 +#: Merge.rc:1148 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1148 +#: Merge.rc:1150 #, c-format msgid "&Difference" msgstr "&Diferen\xE7a" -#: Merge.rc:1150 +#: Merge.rc:1152 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1156 -#: Merge.rc:1930 +#: Merge.rc:1158 +#: Merge.rc:1932 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1159 +#: Merge.rc:1161 #, c-format msgid "Whitespace" msgstr "Espa\xE7o em branco" -#: Merge.rc:1160 +#: Merge.rc:1162 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1162 +#: Merge.rc:1164 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudan\xE7a" -#: Merge.rc:1164 +#: Merge.rc:1166 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1166 +#: Merge.rc:1168 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1168 +#: Merge.rc:1170 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1170 +#: Merge.rc:1172 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:1173 +#: Merge.rc:1175 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos" -#: Merge.rc:1175 +#: Merge.rc:1177 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1177 +#: Merge.rc:1179 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos" -#: Merge.rc:1180 +#: Merge.rc:1182 #, c-format msgid "&File Compare method:" msgstr "&M\xE9todo para Comparar Arquivos:" -#: Merge.rc:1183 +#: Merge.rc:1185 #, c-format msgid "S&top after first difference" msgstr "P&arar ap\xF3s a primeira diferen\xE7a" -#: Merge.rc:1186 +#: Merge.rc:1188 #, c-format msgid "Filter Comments" msgstr "Coment\xE1rios do Filtro" -#: Merge.rc:1193 -#: Merge.rc:1931 +#: Merge.rc:1195 +#: Merge.rc:1933 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1196 +#: Merge.rc:1198 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1198 +#: Merge.rc:1200 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento autom\xE1tico" -#: Merge.rc:1200 +#: Merge.rc:1202 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1202 +#: Merge.rc:1204 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1203 +#: Merge.rc:1205 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1206 +#: Merge.rc:1208 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1208 +#: Merge.rc:1210 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espa\xE7os" -#: Merge.rc:1210 +#: Merge.rc:1212 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferen\xE7as das Linhas" -#: Merge.rc:1212 +#: Merge.rc:1214 #, c-format msgid "View line differences" msgstr "Visualizar as diferen\xE7as das linhas" -#: Merge.rc:1214 +#: Merge.rc:1216 #, c-format msgid "&Character level" msgstr "&N\xEDvel dos caracteres" -#: Merge.rc:1216 +#: Merge.rc:1218 #, c-format msgid "&Word-level:" msgstr "&N\xEDvel das palavras:" -#: Merge.rc:1231 +#: Merge.rc:1233 #, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1237 +#: Merge.rc:1239 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1238 +#: Merge.rc:1240 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1239 +#: Merge.rc:1241 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1240 +#: Merge.rc:1242 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1241 +#: Merge.rc:1243 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1247 +#: Merge.rc:1249 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1250 +#: Merge.rc:1252 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1253 +#: Merge.rc:1255 #, c-format msgid "&Save changes" msgstr "&Salvar mudan\xE7as" -#: Merge.rc:1255 +#: Merge.rc:1257 #, c-format msgid "&Discard changes" msgstr "&Descartar mudan\xE7as" -#: Merge.rc:1257 +#: Merge.rc:1259 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1260 +#: Merge.rc:1262 #, c-format msgid "S&ave changes" msgstr "S&alvar mudan\xE7as" -#: Merge.rc:1262 +#: Merge.rc:1264 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudan\xE7as" -#: Merge.rc:1264 +#: Merge.rc:1266 #, c-format msgid "Discard All" msgstr "Descartar Tudo" -#: Merge.rc:1271 -#: Merge.rc:1519 -#: Merge.rc:1937 +#: Merge.rc:1273 +#: Merge.rc:1521 +#: Merge.rc:1939 #, c-format msgid "Codepage" msgstr "C\xF3digo da p\xE1gina" -#: Merge.rc:1274 +#: Merge.rc:1276 #, c-format msgid "Default Codepage" msgstr "C\xF3digo da P\xE1gina Padr\xE3o" -#: Merge.rc:1275 +#: Merge.rc:1277 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:" -#: Merge.rc:1277 +#: Merge.rc:1279 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2052,56 +2057,56 @@ "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml \n" "precisa reiniciar a sess\xE3o" -#: Merge.rc:1280 +#: Merge.rc:1282 #, c-format msgid "System codepage" msgstr "C\xF3digo de p\xE1gina do sistema" -#: Merge.rc:1282 +#: Merge.rc:1284 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge" -#: Merge.rc:1284 +#: Merge.rc:1286 #, c-format msgid "Custom codepage:" msgstr "C\xF3digo de p\xE1gina personalizado:" -#: Merge.rc:1292 +#: Merge.rc:1294 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suporte para arquivos desativado" -#: Merge.rc:1295 +#: Merge.rc:1297 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)" -#: Merge.rc:1298 +#: Merge.rc:1300 #, 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 "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada." -#: Merge.rc:1300 +#: Merge.rc:1302 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho." -#: Merge.rc:1302 +#: Merge.rc:1304 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis." -#: Merge.rc:1304 +#: Merge.rc:1306 #, c-format msgid "Version" msgstr "Vers\xE3o" -#: Merge.rc:1306 +#: Merge.rc:1308 #, c-format msgid "" "Plugin required\n" @@ -2110,54 +2115,54 @@ "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1308 +#: Merge.rc:1310 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Vers\xE3o recomendada do 7-Zip:" -#: Merge.rc:1311 -#: Merge.rc:1314 +#: Merge.rc:1313 +#: Merge.rc:1316 #, c-format msgid "present" msgstr "atual" -#: Merge.rc:1312 +#: Merge.rc:1314 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1315 +#: Merge.rc:1317 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado no seu computador:" -#: Merge.rc:1317 -#: Merge.rc:1322 +#: Merge.rc:1319 +#: Merge.rc:1324 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1319 +#: Merge.rc:1321 #, c-format msgid "missing" msgstr "faltando" -#: Merge.rc:1320 +#: Merge.rc:1322 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:" -#: Merge.rc:1324 +#: Merge.rc:1326 #, c-format msgid "outdated" msgstr "desatualizado" -#: Merge.rc:1325 +#: Merge.rc:1327 #, c-format msgid "Plugins on path:" msgstr "Plugins no caminho:" -#: Merge.rc:1326 +#: Merge.rc:1328 #, c-format msgid "" "Don't display this &message again.\n" @@ -2166,499 +2171,499 @@ "N\xE3o exibir esta mensagem de novo.\n" "(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)" -#: Merge.rc:1330 +#: Merge.rc:1332 #, c-format msgid "Plugin Download" msgstr "Download do Plugin" -#: Merge.rc:1339 +#: Merge.rc:1341 #, c-format msgid "Options" msgstr "Op\xE7\xF5es" -#: Merge.rc:1350 +#: Merge.rc:1352 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1352 +#: Merge.rc:1354 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1353 +#: Merge.rc:1355 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1361 +#: Merge.rc:1363 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1362 +#: Merge.rc:1364 #, c-format msgid "Function names:" msgstr "Nomes das fun\xE7\xF5es:" -#: Merge.rc:1363 +#: Merge.rc:1365 #, c-format msgid "Comments:" msgstr "Coment\xE1rios:" -#: Merge.rc:1364 +#: Merge.rc:1366 #, c-format msgid "Numbers:" msgstr "N\xFAmeros:" -#: Merge.rc:1365 +#: Merge.rc:1367 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1366 +#: Merge.rc:1368 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1367 +#: Merge.rc:1369 #, c-format msgid "Preprocessor:" msgstr "Pr\xE9-processador:" -#: Merge.rc:1368 +#: Merge.rc:1370 #, c-format msgid "User 1:" msgstr "Usu\xE1rio 1:" -#: Merge.rc:1369 +#: Merge.rc:1371 #, c-format msgid "User 2:" msgstr "Usu\xE1rio 2:" -#: Merge.rc:1374 -#: Merge.rc:1379 -#: Merge.rc:1384 -#: Merge.rc:1389 -#: Merge.rc:1394 -#: Merge.rc:1399 -#: Merge.rc:1404 -#: Merge.rc:1409 -#: Merge.rc:1414 +#: Merge.rc:1376 +#: Merge.rc:1381 +#: Merge.rc:1386 +#: Merge.rc:1391 +#: Merge.rc:1396 +#: Merge.rc:1401 +#: Merge.rc:1406 +#: Merge.rc:1411 +#: Merge.rc:1416 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1422 +#: Merge.rc:1424 #, c-format msgid "Folder Compare Report" msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas" -#: Merge.rc:1425 +#: Merge.rc:1427 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1428 -#: Merge.rc:1602 -#: Merge.rc:1606 -#: Merge.rc:1633 +#: Merge.rc:1430 +#: Merge.rc:1604 +#: Merge.rc:1608 +#: Merge.rc:1635 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1429 +#: Merge.rc:1431 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1432 +#: Merge.rc:1434 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a \xC1rea de Transfer\xEAncia" -#: Merge.rc:1440 +#: Merge.rc:1442 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1443 +#: Merge.rc:1445 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro voc\xEA quer criar?" -#: Merge.rc:1445 +#: Merge.rc:1447 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)" -#: Merge.rc:1447 +#: Merge.rc:1449 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)" -#: Merge.rc:1455 -#: Merge.rc:1938 +#: Merge.rc:1457 +#: Merge.rc:1940 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1458 +#: Merge.rc:1460 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:" -#: Merge.rc:1460 +#: Merge.rc:1462 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar o Plugin do 7-zip" -#: Merge.rc:1461 +#: Merge.rc:1463 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1463 +#: Merge.rc:1465 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usar 7-zip isolado se dispon\xEDvel" -#: Merge.rc:1466 +#: Merge.rc:1468 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sar 7-Zip local da pasta do WinMerge" -#: Merge.rc:1468 +#: Merge.rc:1470 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1476 +#: Merge.rc:1478 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estat\xEDsticas" -#: Merge.rc:1479 +#: Merge.rc:1481 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1480 +#: Merge.rc:1482 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1481 -#: Merge.rc:2319 +#: Merge.rc:1483 +#: Merge.rc:2328 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1482 +#: Merge.rc:1484 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1485 -#: Merge.rc:1504 +#: Merge.rc:1487 +#: Merge.rc:1506 #, c-format msgid "Binary:" msgstr "Bin\xE1rio:" -#: Merge.rc:1488 +#: Merge.rc:1490 #, c-format msgid "Unique" msgstr "\xDAnico" -#: Merge.rc:1489 +#: Merge.rc:1491 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1494 +#: Merge.rc:1496 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1499 -#: Merge.rc:2313 +#: Merge.rc:1501 +#: Merge.rc:2322 #, c-format msgid "Identical" msgstr "Id\xEAnticos" -#: Merge.rc:1508 +#: Merge.rc:1510 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1513 +#: Merge.rc:1515 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1522 +#: Merge.rc:1524 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1525 -#: Merge.rc:1528 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1529 +#: Merge.rc:1531 #, c-format msgid "Select Codepage for" msgstr "Selecionar o C\xF3digo da P\xE1gina para" -#: Merge.rc:1530 +#: Merge.rc:1532 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1532 -#: Merge.rc:1535 +#: Merge.rc:1534 +#: Merge.rc:1537 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1533 +#: Merge.rc:1535 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1536 +#: Merge.rc:1538 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos" -#: Merge.rc:1539 +#: Merge.rc:1541 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1540 -#: Merge.rc:1904 +#: Merge.rc:1542 +#: Merge.rc:1906 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1545 +#: Merge.rc:1547 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1548 +#: Merge.rc:1550 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1550 +#: Merge.rc:1552 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1552 +#: Merge.rc:1554 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1554 +#: Merge.rc:1556 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1558 +#: Merge.rc:1560 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1559 +#: Merge.rc:1561 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1567 +#: Merge.rc:1569 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1570 +#: Merge.rc:1572 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1572 +#: Merge.rc:1574 #, c-format msgid "Whitespace:" msgstr "Espa\xE7o vazio:" -#: Merge.rc:1573 +#: Merge.rc:1575 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1574 +#: Merge.rc:1576 #, c-format msgid "Selection:" msgstr "Sele\xE7\xE3o:" -#: Merge.rc:1597 +#: Merge.rc:1599 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1603 +#: Merge.rc:1605 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1607 +#: Merge.rc:1609 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1613 +#: Merge.rc:1615 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1614 +#: Merge.rc:1616 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1619 -#: Merge.rc:1939 +#: Merge.rc:1621 +#: Merge.rc:1941 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1622 +#: Merge.rc:1624 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1627 +#: Merge.rc:1629 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1628 +#: Merge.rc:1630 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1630 +#: Merge.rc:1632 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1634 +#: Merge.rc:1636 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1635 +#: Merge.rc:1637 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extens\xE3o .bak" -#: Merge.rc:1637 +#: Merge.rc:1639 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1644 -#: Merge.rc:2228 +#: Merge.rc:1646 +#: Merge.rc:2230 #, c-format msgid "Confirm Copy" msgstr "Confirmar a C\xF3pia" -#: Merge.rc:1648 +#: Merge.rc:1650 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?" -#: Merge.rc:1650 +#: Merge.rc:1652 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1653 +#: Merge.rc:1655 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1656 +#: Merge.rc:1658 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1657 +#: Merge.rc:1659 #, c-format msgid "No" msgstr "N\xE3o" -#: Merge.rc:1663 +#: Merge.rc:1665 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1666 +#: Merge.rc:1668 #, c-format msgid "&Enable plugins" msgstr "&Ativar plugins" #. StringFileInfo.Block -#: Merge.rc:1696 +#: Merge.rc:1698 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1712 +#: Merge.rc:1714 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1727 +#: Merge.rc:1729 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1733 +#: Merge.rc:1735 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1734 +#: Merge.rc:1736 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1735 +#: Merge.rc:1737 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1736 +#: Merge.rc:1738 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1737 +#: Merge.rc:1739 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1738 +#: Merge.rc:1740 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1744 +#: Merge.rc:1746 #, c-format msgid "" "Create empty documents\n" @@ -2667,7 +2672,7 @@ "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:1745 +#: Merge.rc:1747 #, c-format msgid "" "Open an existing document\n" @@ -2676,7 +2681,7 @@ "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1746 +#: Merge.rc:1748 #, c-format msgid "" "Close the active document\n" @@ -2685,7 +2690,7 @@ "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1747 +#: Merge.rc:1749 #, c-format msgid "" "Save the active document\n" @@ -2694,7 +2699,7 @@ "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:1748 +#: Merge.rc:1750 #, c-format msgid "" "Save the active document with a new name\n" @@ -2703,7 +2708,7 @@ "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:1749 +#: Merge.rc:1751 #, c-format msgid "" "Change the printing options\n" @@ -2712,7 +2717,7 @@ "Mudar as op\xE7\xF5es de impress\xE3o\n" "Configurar P\xE1gina" -#: Merge.rc:1750 +#: Merge.rc:1752 #, c-format msgid "" "Change the printer and printing options\n" @@ -2721,7 +2726,7 @@ "Mudar a impressora e as op\xE7\xF5es de impress\xE3o\n" "Configurar a impress\xE3o" -#: Merge.rc:1751 +#: Merge.rc:1753 #, c-format msgid "" "Print the active document\n" @@ -2730,7 +2735,7 @@ "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:1752 +#: Merge.rc:1754 #, c-format msgid "" "Display full pages\n" @@ -2739,27 +2744,27 @@ "Exibir p\xE1ginas completas\n" "Pr\xE9-Visualizar Impress\xE3o" -#: Merge.rc:1757 +#: Merge.rc:1759 #, c-format msgid "Make all hidden items visible again" msgstr "Tornar todos os itens escondidos vis\xEDveis de novo" -#: Merge.rc:1758 +#: Merge.rc:1760 #, c-format msgid "Toggle tree mode" msgstr "Ativar o modo \xE1rvore" -#: Merge.rc:1759 +#: Merge.rc:1761 #, c-format msgid "Expand all subfolders" msgstr "Expandir todas as sub-pastas" -#: Merge.rc:1760 +#: Merge.rc:1762 #, c-format msgid "Collapse all subfolders" msgstr "Retrair todas as sub-pastas" -#: Merge.rc:1766 +#: Merge.rc:1768 #, c-format msgid "" "Open project file\n" @@ -2768,32 +2773,32 @@ "Abrir o arquivo do projeto\n" "Arquivo do projeto (Ctrl+J)" -#: Merge.rc:1767 +#: Merge.rc:1769 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto" -#: Merge.rc:1768 +#: Merge.rc:1770 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto" -#: Merge.rc:1769 +#: Merge.rc:1771 #, c-format msgid "Project File" msgstr "Arquivo do Projeto" -#: Merge.rc:1770 +#: Merge.rc:1772 #, c-format msgid "Project file successfully loaded." msgstr "Arquivo do projeto carregado com sucesso." -#: Merge.rc:1771 +#: Merge.rc:1773 #, c-format msgid "Project file successfully saved." msgstr "Arquivo do projeto salvo com sucesso." -#: Merge.rc:1772 +#: Merge.rc:1774 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2802,7 +2807,7 @@ "Salvar os caminhos atuais e op\xE7\xF5es no arquivo do projeto\n" "Salvar o Arquivo do Projeto" -#: Merge.rc:1777 +#: Merge.rc:1779 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2811,7 +2816,7 @@ "Exibir as informa\xE7\xF5es do programa, n\xFAmero da vers\xE3o e copyright\n" "Sobre" -#: Merge.rc:1778 +#: Merge.rc:1780 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2820,8 +2825,6 @@ "Sair do aplicativo; alertar para salvar os documentos\n" "Sair" -#: Merge.rc:1784 -#: Merge.rc:1785 #: Merge.rc:1786 #: Merge.rc:1787 #: Merge.rc:1788 @@ -2836,11 +2839,13 @@ #: Merge.rc:1797 #: Merge.rc:1798 #: Merge.rc:1799 +#: Merge.rc:1800 +#: Merge.rc:1801 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:1804 +#: Merge.rc:1806 #, c-format msgid "" "Switch to the next window pane\n" @@ -2849,7 +2854,7 @@ "Troca para o pr\xF3ximo painel da janela\n" "Painel Seguinte" -#: Merge.rc:1805 +#: Merge.rc:1807 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2858,7 +2863,7 @@ "Troca de volta para o painel da janela anterior\n" "Painel Anterior" -#: Merge.rc:1811 +#: Merge.rc:1813 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2867,7 +2872,7 @@ "Organiza as janelas para que elas se sobreponham\n" "Janelas em Cascata" -#: Merge.rc:1812 +#: Merge.rc:1814 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2876,7 +2881,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas horizontalmente\n" "Janelas Lado a Lado Horizontalmente" -#: Merge.rc:1813 +#: Merge.rc:1815 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2885,7 +2890,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas verticalmente\n" "Janelas Lado a Lado Verticalmente" -#: Merge.rc:1819 +#: Merge.rc:1821 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2894,7 +2899,7 @@ "Copia a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Copiar" -#: Merge.rc:1820 +#: Merge.rc:1822 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2903,7 +2908,7 @@ "Corta a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Cortar" -#: Merge.rc:1821 +#: Merge.rc:1823 #, c-format msgid "" "Find the specified text\n" @@ -2912,7 +2917,7 @@ "Achar o texto especificado\n" "Achar" -#: Merge.rc:1822 +#: Merge.rc:1824 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2921,7 +2926,7 @@ "Inserir os conte\xFAdos da \xC1rea de Transfer\xEAncia\n" "Colar" -#: Merge.rc:1823 +#: Merge.rc:1825 #, c-format msgid "" "Repeat the last action\n" @@ -2930,7 +2935,7 @@ "Repetir a \xFAltima a\xE7\xE3o\n" "Repetir" -#: Merge.rc:1824 +#: Merge.rc:1826 #, c-format msgid "" "Replace specific text with different text\n" @@ -2939,7 +2944,7 @@ "Substitui o texto espec\xEDfico com um texto diferente\n" "Substituir" -#: Merge.rc:1825 +#: Merge.rc:1827 #, c-format msgid "" "Select the entire document\n" @@ -2948,7 +2953,7 @@ "Seleciona o documento inteiro\n" "Selecionar Tudo" -#: Merge.rc:1826 +#: Merge.rc:1828 #, c-format msgid "" "Undo the last action\n" @@ -2957,7 +2962,7 @@ "Desfazer a \xFAltima a\xE7\xE3o\n" "Desfazer" -#: Merge.rc:1827 +#: Merge.rc:1829 #, c-format msgid "" "Redo the previously undone action\n" @@ -2966,7 +2971,7 @@ "Refazer a a\xE7\xE3o desfeita anteriormente\n" "Refazer" -#: Merge.rc:1833 +#: Merge.rc:1835 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2975,7 +2980,7 @@ "Mostrar ou esconder a barra de ferramentas\n" "Ativar a Barra de Ferramentas" -#: Merge.rc:1834 +#: Merge.rc:1836 #, c-format msgid "" "Show or hide the status bar\n" @@ -2984,7 +2989,7 @@ "Mostrar ou esconder a barra de status\n" "Ativar a Barra de Status" -#: Merge.rc:1835 +#: Merge.rc:1837 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2993,7 +2998,7 @@ "Mostrar ou esconder a barra das abas\n" "Ativar a Barra das Abas" -#: Merge.rc:1836 +#: Merge.rc:1838 #, c-format msgid "" "Automatically resize panes\n" @@ -3002,57 +3007,57 @@ "Automaticamente redimensionar os pain\xE9is\n" "Trancar os Pain\xE9is" -#: Merge.rc:1842 +#: Merge.rc:1844 #, c-format msgid "Change the window size" msgstr "Mudar o tamanho da janela" -#: Merge.rc:1843 +#: Merge.rc:1845 #, c-format msgid "Change the window position" msgstr "Mudar a posi\xE7\xE3o da janela" -#: Merge.rc:1844 +#: Merge.rc:1846 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um \xEDcone" -#: Merge.rc:1845 +#: Merge.rc:1847 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho completo" -#: Merge.rc:1846 +#: Merge.rc:1848 #, c-format msgid "Switch to the next document window" msgstr "Trocar para a pr\xF3xima janela do documento" -#: Merge.rc:1847 +#: Merge.rc:1849 #, c-format msgid "Switch to the previous document window" msgstr "Trocar para a janela do documento anterior" -#: Merge.rc:1848 +#: Merge.rc:1850 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e alerta para salvar os documentos" -#: Merge.rc:1853 +#: Merge.rc:1855 #, c-format msgid "Restore the window to normal size" msgstr "Restaurar a janela para o tamanho normal" -#: Merge.rc:1854 +#: Merge.rc:1856 #, c-format msgid "Activate Task List" msgstr "Ativar a Lista de Tarefas" -#: Merge.rc:1855 +#: Merge.rc:1857 #, c-format msgid "Activate this window" msgstr "Ativar esta janela" -#: Merge.rc:1861 +#: Merge.rc:1863 #, c-format msgid "" "Close print preview mode\n" @@ -3061,7 +3066,7 @@ "Fechar o modo de pr\xE9-visualiza\xE7\xE3o da impress\xE3o\n" "Cancelar a Pr\xE9-Visualiza\xE7\xE3o" -#: Merge.rc:1868 +#: Merge.rc:1870 #, c-format msgid "" "\n" @@ -3080,7 +3085,7 @@ "WinMerge.FileCompare\n" "Compara\xE7\xE3o dos Arquivos do WinMerge" -#: Merge.rc:1869 +#: Merge.rc:1871 #, c-format msgid "" "\n" @@ -3099,23 +3104,23 @@ "WinMerge.FolderCompare\n" "Compara\xE7\xE3o das Pastas do WinMerge" -#: Merge.rc:1876 +#: Merge.rc:1878 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar os caracs. EOL originais" -#: Merge.rc:1883 +#: Merge.rc:1885 #, c-format msgid "Press any key" msgstr "Pressione qualquer tecla" -#: Merge.rc:1889 -#: Merge.rc:1890 +#: Merge.rc:1891 +#: Merge.rc:1892 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o direito no caminho para copiar" -#: Merge.rc:1896 +#: Merge.rc:1898 #, c-format msgid "" "Developers:\n" @@ -3124,152 +3129,152 @@ "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1897 +#: Merge.rc:1899 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este \xE9 um software livre e voc\xEA \xE9 bem vindo para redistribu\xED-lo sob certas circunst\xE2ncias; veja o GNU Licen\xE7a para o P\xFAblico em Geral no menu Ajuda para detalhes." -#: Merge.rc:1903 +#: Merge.rc:1905 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1905 +#: Merge.rc:1907 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:1906 +#: Merge.rc:1908 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:1907 +#: Merge.rc:1909 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:1908 +#: Merge.rc:1910 #, c-format msgid "Ignore &all" msgstr "Ignorar &tudo" -#: Merge.rc:1909 +#: Merge.rc:1911 #, c-format msgid "&Yes" msgstr "&Sim" -#: Merge.rc:1915 +#: Merge.rc:1917 #, c-format msgid "Yes to &all" msgstr "Sim para &todos" -#: Merge.rc:1916 +#: Merge.rc:1918 #, c-format msgid "&No" msgstr "&N\xE3o" -#: Merge.rc:1917 +#: Merge.rc:1919 #, c-format msgid "No to a&ll" msgstr "N\xE3o para t&odos" -#: Merge.rc:1918 +#: Merge.rc:1920 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:1919 +#: Merge.rc:1921 #, c-format msgid "&Skip" msgstr "&Pular" -#: Merge.rc:1920 +#: Merge.rc:1922 #, c-format msgid "Skip &all" msgstr "Pular &tudo" -#: Merge.rc:1922 +#: Merge.rc:1924 #, c-format msgid "Don't display this &message again." msgstr "N\xE3o exibir esta &mensagem de novo." -#: Merge.rc:1923 +#: Merge.rc:1925 #, c-format msgid "Don't ask this &question again." msgstr "N\xE3o perguntar esta &quest\xE3o de novo." -#: Merge.rc:1933 +#: Merge.rc:1935 #, c-format msgid "Syntax colors" msgstr "Cores da sintaxe" -#: Merge.rc:1934 +#: Merge.rc:1936 #, c-format msgid "Text Colors" msgstr "Cores do Texto" -#: Merge.rc:1936 +#: Merge.rc:1938 #, c-format msgid "Version Control" msgstr "Controle da Vers\xE3o" -#: Merge.rc:1946 +#: Merge.rc:1948 #, c-format msgid "To:" msgstr "Para:" -#: Merge.rc:1947 +#: Merge.rc:1949 #, c-format msgid "From left:" msgstr "Da esquerda:" -#: Merge.rc:1948 +#: Merge.rc:1950 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:1949 +#: Merge.rc:1951 #, c-format msgid "From right:" msgstr "Da direita:" -#: Merge.rc:1950 +#: Merge.rc:1952 #, c-format msgid "To right:" msgstr "Para a direita:" -#: Merge.rc:1956 +#: Merge.rc:1958 #, c-format msgid "Version %1" msgstr "Vers\xE3o %1" -#: Merge.rc:1957 +#: Merge.rc:1959 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1963 +#: Merge.rc:1965 #, c-format msgid "Options (%1)" msgstr "Op\xE7\xF5es (%1)" -#: Merge.rc:1964 +#: Merge.rc:1966 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensagens agora ser\xE3o exibidas de novo." -#: Merge.rc:1965 +#: Merge.rc:1967 #, 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 "Modifica\xE7\xF5es foram feitas na sess\xE3o de compara\xE7\xE3o do arquivo atual. Algumas configura\xE7\xF5es podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o do arquivo atual seja reiniciada." -#: Merge.rc:1966 +#: Merge.rc:1968 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A mudan\xE7a da fonte selecionada n\xE3o ser\xE1 aplicada a qualquer das janelas das diferen\xE7as atualmente vis\xEDveis." -#: Merge.rc:1968 +#: Merge.rc:1970 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3280,7 +3285,7 @@ "\n" "Por favor use valores de 1 - %1." -#: Merge.rc:1970 +#: Merge.rc:1972 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3291,129 +3296,129 @@ "\n" "Por favor reinicie o WinMerge ap\xF3s o reset." -#: Merge.rc:1976 +#: Merge.rc:1978 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1977 +#: Merge.rc:1979 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1978 +#: Merge.rc:1980 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1979 +#: Merge.rc:1981 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1981 +#: Merge.rc:1983 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos das op\xE7\xF5es (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1987 +#: Merge.rc:1989 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1988 +#: Merge.rc:1990 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1989 +#: Merge.rc:1991 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1995 +#: Merge.rc:1997 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1996 +#: Merge.rc:1998 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1997 +#: Merge.rc:1999 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1998 +#: Merge.rc:2000 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:2004 +#: Merge.rc:2006 #, c-format msgid "Full Contents" msgstr "Conte\xFAdos Completos" -#: Merge.rc:2005 +#: Merge.rc:2007 #, c-format msgid "Quick Contents" msgstr "Conte\xFAdos R\xE1pidos" -#: Merge.rc:2006 +#: Merge.rc:2008 #, c-format msgid "Modified Date" msgstr "Data Modificada" -#: Merge.rc:2007 +#: Merge.rc:2009 #, c-format msgid "Modified Date and Size" msgstr "Data e Tamanho Modificados" -#: Merge.rc:2008 +#: Merge.rc:2010 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:2014 -#: Merge.rc:2631 +#: Merge.rc:2016 +#: Merge.rc:2640 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2015 +#: Merge.rc:2017 #, c-format msgid "Location" msgstr "Local" -#: Merge.rc:2016 +#: Merge.rc:2018 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2017 +#: Merge.rc:2019 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2018 -#: Merge.rc:2633 +#: Merge.rc:2020 +#: Merge.rc:2642 #, c-format msgid "Description" msgstr "Descri\xE7\xE3o" -#: Merge.rc:2019 +#: Merge.rc:2021 #, c-format msgid "Select filename for new filter" msgstr "Selecionar o nome do arquivo para o novo filtro" -#: Merge.rc:2020 +#: Merge.rc:2022 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2022 +#: Merge.rc:2024 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3426,7 +3431,7 @@ "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:2024 +#: Merge.rc:2026 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3439,7 +3444,7 @@ "\n" "Por favor tenha certeza de que a pasta exista e \xE9 grav\xE1vel." -#: Merge.rc:2026 +#: Merge.rc:2028 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3450,7 +3455,7 @@ "\n" "Por favor selecione a pasta do filtro em Op\xE7\xF5es/Sistema." -#: Merge.rc:2028 +#: Merge.rc:2030 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3463,12 +3468,12 @@ "\n" "Talvez o arquivo seja somente-leitura?" -#: Merge.rc:2029 +#: Merge.rc:2031 #, c-format msgid "Locate filter file to install" msgstr "Localizar o filtro do arquivo para instalar" -#: Merge.rc:2031 +#: Merge.rc:2033 #, c-format msgid "" "Installing filter file failed.\n" @@ -3479,17 +3484,17 @@ "\n" "N\xE3o p\xF4de copiar o novo arquivo do filtro para a pasta do filtro." -#: Merge.rc:2033 +#: Merge.rc:2035 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo do filtro j\xE1 existe. Sobrescrever o filtro existente?" -#: Merge.rc:2039 +#: Merge.rc:2041 #, c-format msgid "Regular expression" msgstr "Express\xE3o regular" -#: Merge.rc:2045 +#: Merge.rc:2047 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3500,203 +3505,203 @@ "\n" "Se voc\xEA n\xE3o quer atualizar todas as compara\xE7\xF5es agora voc\xEA pode selecionar o N\xE3o e atualizar as compara\xE7\xF5es mais tarde." -#: Merge.rc:2052 +#: Merge.rc:2054 #, c-format msgid "&Path to SS.EXE:" msgstr "&Caminho para o SS.EXE:" -#: Merge.rc:2058 +#: Merge.rc:2060 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Compara\xE7\xE3o dos Pastas" -#: Merge.rc:2059 +#: Merge.rc:2061 #, c-format msgid "File Comparison" msgstr "Compara\xE7\xE3o de Arquivo" -#: Merge.rc:2060 +#: Merge.rc:2062 #, c-format msgid "Untitled left" msgstr "Sem t\xEDtulo a esquerda" -#: Merge.rc:2061 +#: Merge.rc:2063 #, c-format msgid "Untitled right" msgstr "Sem t\xEDtulo a direita" -#: Merge.rc:2062 +#: Merge.rc:2064 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2063 +#: Merge.rc:2065 #, c-format msgid "Mine File" msgstr "Meu Arquivo" -#: Merge.rc:2069 +#: Merge.rc:2071 #, c-format msgid "Scanning files..." msgstr "Escaneando arquivos..." -#: Merge.rc:2070 +#: Merge.rc:2072 #, c-format msgid "Opening selection" msgstr "Abrindo a sele\xE7\xE3o" -#: Merge.rc:2071 +#: Merge.rc:2073 #, c-format msgid "Copying Left to Right" msgstr "Copiando da Esquerda para a Direita" -#: Merge.rc:2072 +#: Merge.rc:2074 #, c-format msgid "Copying Right to Left" msgstr "Copiando da Direita para a Esquerda" -#: Merge.rc:2073 +#: Merge.rc:2075 #, c-format msgid "Copying All to Left" msgstr "Copiando Tudo para a Esquerda" -#: Merge.rc:2074 +#: Merge.rc:2076 #, c-format msgid "Copying All to Right" msgstr "Copiando Tudo para a Direita" -#: Merge.rc:2075 +#: Merge.rc:2077 #, c-format msgid "Copying files..." msgstr "Copiando os arquivos..." -#: Merge.rc:2076 +#: Merge.rc:2078 #, c-format msgid "Deleting files..." msgstr "Apagando os arquivos..." -#: Merge.rc:2077 +#: Merge.rc:2079 #, c-format msgid "Moving files..." msgstr "Movendo os arquivos..." -#: Merge.rc:2078 +#: Merge.rc:2080 #, c-format msgid "Creating the report..." msgstr "Criando o relat\xF3rio..." -#: Merge.rc:2079 +#: Merge.rc:2081 #, c-format msgid "Undoing the last operation..." msgstr "Desfazendo a \xFAltima opera\xE7\xE3o..." -#: Merge.rc:2080 +#: Merge.rc:2082 #, c-format msgid "Redoing the previous operation..." msgstr "Refazendo a opera\xE7\xE3o anterior" -#: Merge.rc:2086 +#: Merge.rc:2088 #, 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:2087 +#: Merge.rc:2089 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2088 +#: Merge.rc:2090 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Ch: %d/%d" -#: Merge.rc:2089 +#: Merge.rc:2091 #, c-format msgid "Merge" msgstr "Unir" -#: Merge.rc:2090 +#: Merge.rc:2092 #, c-format msgid "Difference %1 of %2" msgstr "Diferen\xE7a %1 de %2" -#: Merge.rc:2091 +#: Merge.rc:2093 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferen\xE7as Achadas" -#: Merge.rc:2092 +#: Merge.rc:2094 #, c-format msgid "1 Difference Found" msgstr "1 Diferen\xE7a Achada" #. Abbreviation from "Read Only" -#: Merge.rc:2093 +#: Merge.rc:2095 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2099 +#: Merge.rc:2101 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2100 +#: Merge.rc:2102 #, c-format msgid "Items: %1" msgstr "Itens: %1" -#: Merge.rc:2106 +#: Merge.rc:2108 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione duas pastas ou arquivos existentes para comparar" -#: Merge.rc:2107 +#: Merge.rc:2109 #, c-format msgid "Folder Selection" msgstr "Sele\xE7\xE3o de Pastas" -#: Merge.rc:2108 +#: Merge.rc:2110 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecione duas pastas ou dois arquivos para comparar." -#: Merge.rc:2109 +#: Merge.rc:2111 #, c-format msgid "Left path is invalid!" msgstr "O caminho esquerdo \xE9 inv\xE1lido!" -#: Merge.rc:2110 +#: Merge.rc:2112 #, c-format msgid "Right path is invalid!" msgstr "O caminho direito \xE9 inv\xE1lido!" -#: Merge.rc:2111 +#: Merge.rc:2113 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os caminhos s\xE3o inv\xE1lidos!" -#: Merge.rc:2112 +#: Merge.rc:2114 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolher dois arquivos para ativar a sele\xE7\xE3o do desempacotador." -#: Merge.rc:2113 +#: Merge.rc:2115 #, c-format msgid "Cannot compare file and folder!" msgstr "N\xE3o p\xF4de comparar o arquivo e a pasta!" -#: Merge.rc:2119 +#: Merge.rc:2121 #, c-format msgid "File not found: %1" msgstr "Arquivo n\xE3o achado: %1" -#: Merge.rc:2120 +#: Merge.rc:2122 #, c-format msgid "File not unpacked: %1" msgstr "Arquivo n\xE3o desempacotado: %1" -#: Merge.rc:2121 +#: Merge.rc:2123 #, c-format msgid "" "Cannot open file\n" @@ -3709,12 +3714,12 @@ "\n" "%2" -#: Merge.rc:2122 +#: Merge.rc:2124 #, c-format msgid "Failed to parse conflict file." msgstr "Falhou em analisar o arquivo do conflito." -#: Merge.rc:2123 +#: Merge.rc:2125 #, c-format msgid "" "The file\n" @@ -3725,32 +3730,32 @@ "%1\n" "n\xE3o \xE9 um arquivo de conflito." -#: Merge.rc:2129 +#: Merge.rc:2131 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2130 +#: Merge.rc:2132 #, c-format msgid "Save changes to %1?" msgstr "Salvar as mudan\xE7as em %1?" -#: Merge.rc:2131 +#: Merge.rc:2133 #, 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\xE1 marcado como somente-leitura. Voc\xEA gostaria de sobrescrever o arquivo somente-leitura ? (N\xE3o para salvar com um novo nome de arquivo.)" -#: Merge.rc:2132 +#: Merge.rc:2134 #, c-format msgid "Error checking destination writeability" msgstr "Erro ao verificar a habilidade de gravar no destino" -#: Merge.rc:2133 +#: Merge.rc:2135 #, c-format msgid "Error backing up file" msgstr "Erro ao fazer o backup do arquivo" -#: Merge.rc:2135 +#: Merge.rc:2137 #, c-format msgid "" "Unable to backup original file:\n" @@ -3763,7 +3768,7 @@ "\n" "Continuar de qualquer maneira?" -#: Merge.rc:2136 +#: Merge.rc:2138 #, c-format msgid "" "Saving file failed.\n" @@ -3780,7 +3785,7 @@ "\t-usar um nome de arquivo diferente (Pressione Ok)\n" "\t-abortar a opera\xE7\xE3o atual (Pre... [truncated message content] |
From: <ge...@us...> - 2008-12-05 00:02:45
|
Revision: 6150 http://winmerge.svn.sourceforge.net/winmerge/?rev=6150&view=rev Author: gerundt Date: 2008-12-05 00:02:43 +0000 (Fri, 05 Dec 2008) Log Message: ----------- Add "X-Poedit-Basepath" header to some PO(T) files and remove "X-Generator" Modified Paths: -------------- trunk/Src/Languages/CreateMasterPotFile.vbs trunk/Src/Languages/English.pot trunk/Src/Languages/Greek.po trunk/Src/Languages/Romanian.po Modified: trunk/Src/Languages/CreateMasterPotFile.vbs =================================================================== --- trunk/Src/Languages/CreateMasterPotFile.vbs 2008-12-04 23:49:08 UTC (rev 6149) +++ trunk/Src/Languages/CreateMasterPotFile.vbs 2008-12-05 00:02:43 UTC (rev 6150) @@ -251,7 +251,8 @@ oPotFile.WriteLine """Content-Transfer-Encoding: 8bit\n""" oPotFile.WriteLine """X-Poedit-Language: English\n""" oPotFile.WriteLine """X-Poedit-SourceCharset: CP" & sCodePage & "\n""" - oPotFile.WriteLine """X-Generator: CreateMasterPotFile.vbs\n""" + oPotFile.WriteLine """X-Poedit-Basepath: ../\n""" + 'oPotFile.WriteLine """X-Generator: CreateMasterPotFile.vbs\n""" oPotFile.WriteLine For Each sKey In oStrings.Keys 'For all strings... Set oString = oStrings(sKey) Modified: trunk/Src/Languages/English.pot =================================================================== --- trunk/Src/Languages/English.pot 2008-12-04 23:49:08 UTC (rev 6149) +++ trunk/Src/Languages/English.pot 2008-12-05 00:02:43 UTC (rev 6150) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-12-02 01:03+0000\n" +"POT-Creation-Date: 2008-12-05 00:52+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <win...@li...>\n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: English\n" "X-Poedit-SourceCharset: CP1252\n" -"X-Generator: CreateMasterPotFile.vbs\n" +"X-Poedit-Basepath: ../\n" #. LANGUAGE, SUBLANGUAGE #: Merge.rc:22 Modified: trunk/Src/Languages/Greek.po =================================================================== --- trunk/Src/Languages/Greek.po 2008-12-04 23:49:08 UTC (rev 6149) +++ trunk/Src/Languages/Greek.po 2008-12-05 00:02:43 UTC (rev 6150) @@ -20,7 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: English\n" "X-Poedit-SourceCharset: CP1252\n" -"X-Generator: CreateMasterPotFile.vbs\n" +"X-Poedit-Basepath: ../\n" #. LANGUAGE, SUBLANGUAGE #: Merge.rc:22 Modified: trunk/Src/Languages/Romanian.po =================================================================== --- trunk/Src/Languages/Romanian.po 2008-12-04 23:49:08 UTC (rev 6149) +++ trunk/Src/Languages/Romanian.po 2008-12-05 00:02:43 UTC (rev 6150) @@ -20,8 +20,8 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Romanian\n" "X-Poedit-SourceCharset: CP1252\n" -"X-Generator: CreateMasterPotFile.vbs\n" "X-Poedit-Country: ROMANIA\n" +"X-Poedit-Basepath: ../\n" #. LANGUAGE, SUBLANGUAGE #: Merge.rc:22 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2008-12-19 14:58:19
|
Revision: 6199 http://winmerge.svn.sourceforge.net/winmerge/?rev=6199&view=rev Author: kimmov Date: 2008-12-19 14:58:13 +0000 (Fri, 19 Dec 2008) Log Message: ----------- Update WinMerge executable translation files. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/French.po trunk/Src/Languages/Galician.po trunk/Src/Languages/German.po trunk/Src/Languages/Greek.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po trunk/Src/Languages/Ukrainian.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2008-12-19 14:53:45 UTC (rev 6198) +++ trunk/Src/Languages/Brazilian.po 2008-12-19 14:58:13 UTC (rev 6199) @@ -391,7 +391,7 @@ #: Merge.rc:175 #: Merge.rc:296 #: Merge.rc:484 -#: Merge.rc:1923 +#: Merge.rc:1925 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -722,7 +722,7 @@ msgstr "&Scripts" #: Merge.rc:370 -#: Merge.rc:2776 +#: Merge.rc:2779 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -924,15 +924,15 @@ msgstr "&Apagar" #: Merge.rc:523 -#: Merge.rc:1143 -#: Merge.rc:1525 +#: Merge.rc:1145 +#: Merge.rc:1527 #, c-format msgid "&Left" msgstr "&Esquerda" #: Merge.rc:524 -#: Merge.rc:1145 -#: Merge.rc:1528 +#: Merge.rc:1147 +#: Merge.rc:1530 #, c-format msgid "&Right" msgstr "&Direita" @@ -1084,17 +1084,17 @@ #: Merge.rc:674 #: Merge.rc:706 -#: Merge.rc:798 -#: Merge.rc:984 -#: Merge.rc:1062 -#: Merge.rc:1091 -#: Merge.rc:1101 -#: Merge.rc:1267 -#: Merge.rc:1331 -#: Merge.rc:1344 -#: Merge.rc:1436 -#: Merge.rc:1451 -#: Merge.rc:1673 +#: Merge.rc:800 +#: Merge.rc:986 +#: Merge.rc:1064 +#: Merge.rc:1093 +#: Merge.rc:1103 +#: Merge.rc:1269 +#: Merge.rc:1333 +#: Merge.rc:1346 +#: Merge.rc:1438 +#: Merge.rc:1453 +#: Merge.rc:1675 #, c-format msgid "OK" msgstr "OK" @@ -1110,39 +1110,39 @@ msgstr "Selecionar Arquivos ou Pastas" #: Merge.rc:685 -#: Merge.rc:1602 +#: Merge.rc:1604 #, c-format msgid "&Left:" msgstr "&Esquerda:" #: Merge.rc:689 #: Merge.rc:750 -#: Merge.rc:1005 -#: Merge.rc:1027 +#: Merge.rc:1007 +#: Merge.rc:1029 #, c-format msgid "&Browse..." msgstr "&Procurar..." #: Merge.rc:690 -#: Merge.rc:1606 +#: Merge.rc:1608 #, c-format msgid "&Right:" msgstr "&Direita:" #: Merge.rc:694 -#: Merge.rc:1038 +#: Merge.rc:1040 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." #: Merge.rc:695 -#: Merge.rc:1610 +#: Merge.rc:1612 #, c-format msgid "&Filter:" msgstr "&Filtro:" #: Merge.rc:698 -#: Merge.rc:1612 +#: Merge.rc:1614 #, c-format msgid "Select..." msgstr "Selecionar..." @@ -1158,7 +1158,7 @@ msgstr "&Selecionar..." #: Merge.rc:703 -#: Merge.rc:1613 +#: Merge.rc:1615 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" @@ -1170,25 +1170,25 @@ #: Merge.rc:707 #: Merge.rc:737 -#: Merge.rc:799 -#: Merge.rc:829 -#: Merge.rc:861 -#: Merge.rc:871 -#: Merge.rc:1063 -#: Merge.rc:1092 -#: Merge.rc:1102 -#: Merge.rc:1153 -#: Merge.rc:1268 -#: Merge.rc:1345 -#: Merge.rc:1437 -#: Merge.rc:1452 -#: Merge.rc:1674 +#: Merge.rc:801 +#: Merge.rc:831 +#: Merge.rc:863 +#: Merge.rc:873 +#: Merge.rc:1065 +#: Merge.rc:1094 +#: Merge.rc:1104 +#: Merge.rc:1155 +#: Merge.rc:1270 +#: Merge.rc:1347 +#: Merge.rc:1439 +#: Merge.rc:1454 +#: Merge.rc:1676 #, c-format msgid "Cancel" msgstr "Cancelar" #: Merge.rc:708 -#: Merge.rc:1346 +#: Merge.rc:1348 #, c-format msgid "Help" msgstr "Ajuda" @@ -1229,7 +1229,7 @@ msgstr "Link para o projeto VSS Destino" #: Merge.rc:733 -#: Merge.rc:876 +#: Merge.rc:878 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" @@ -1240,7 +1240,7 @@ msgstr "Veja Isso" #: Merge.rc:736 -#: Merge.rc:872 +#: Merge.rc:874 #, c-format msgid "Save As..." msgstr "Salvar Como..." @@ -1256,13 +1256,13 @@ msgstr "&Sistema de Vers\xF5es:" #: Merge.rc:748 -#: Merge.rc:2053 +#: Merge.rc:2056 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" #: Merge.rc:755 -#: Merge.rc:1931 +#: Merge.rc:1933 #, c-format msgid "General" msgstr "Geral" @@ -1309,746 +1309,751 @@ #: Merge.rc:777 #, c-format +msgid "Show \"Select Files or Folders\" Dialog on Startup" +msgstr "" + +#: Merge.rc:779 +#, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-Conclus\xE3o do di\xE1logo-Abrir:" -#: Merge.rc:780 +#: Merge.rc:782 #, c-format msgid "Enable multiple compare windows for" msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para" -#: Merge.rc:782 -#: Merge.rc:1625 +#: Merge.rc:784 +#: Merge.rc:1627 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" -#: Merge.rc:784 -#: Merge.rc:1627 +#: Merge.rc:786 +#: Merge.rc:1629 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" -#: Merge.rc:786 +#: Merge.rc:788 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o bot\xE3o Resetar para tornar todas as caixas de mensagens vis\xEDveis de novo." -#: Merge.rc:788 +#: Merge.rc:790 #, c-format msgid "Reset" msgstr "Resetar" -#: Merge.rc:795 +#: Merge.rc:797 #, c-format msgid "Language" msgstr "Idiomas" -#: Merge.rc:802 +#: Merge.rc:804 #, c-format msgid "Available languages:" msgstr "Idiomas dispon\xEDveis:" -#: Merge.rc:808 +#: Merge.rc:810 #, c-format msgid "Find" msgstr "Achar" -#: Merge.rc:811 -#: Merge.rc:838 +#: Merge.rc:813 +#: Merge.rc:840 #, c-format msgid "Fi&nd what:" msgstr "Ac&har:" -#: Merge.rc:814 -#: Merge.rc:844 +#: Merge.rc:816 +#: Merge.rc:846 #, c-format msgid "Match &whole word only" msgstr "Combinar &apenas palavras inteiras" -#: Merge.rc:816 -#: Merge.rc:846 +#: Merge.rc:818 +#: Merge.rc:848 #, c-format msgid "Match &case" msgstr "Combinar &com o caso sensitivo" -#: Merge.rc:818 -#: Merge.rc:848 +#: Merge.rc:820 +#: Merge.rc:850 #, c-format msgid "Regular &expression" msgstr "Express&\xE3o regular" -#: Merge.rc:820 +#: Merge.rc:822 #, c-format msgid "D&on't wrap end of file" msgstr "N&\xE3o organizar o final do arquivo" -#: Merge.rc:823 +#: Merge.rc:825 #, c-format msgid "Direction" msgstr "Dire\xE7\xE3o" -#: Merge.rc:824 +#: Merge.rc:826 #, c-format msgid "&Up" msgstr "&Pra cima" -#: Merge.rc:826 +#: Merge.rc:828 #, c-format msgid "&Down" msgstr "&Pra baixo" -#: Merge.rc:828 -#: Merge.rc:858 +#: Merge.rc:830 +#: Merge.rc:860 #, c-format msgid "&Find Next" msgstr "&Achar o Pr\xF3ximo" -#: Merge.rc:835 +#: Merge.rc:837 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:841 +#: Merge.rc:843 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:850 +#: Merge.rc:852 #, c-format msgid "&Don't wrap end of file" msgstr "&N\xE3o organizar o final do arquivo" -#: Merge.rc:853 +#: Merge.rc:855 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:854 +#: Merge.rc:856 #, c-format msgid "&Selection" msgstr "&Sele\xE7\xE3o" -#: Merge.rc:856 +#: Merge.rc:858 #, c-format msgid "Wh&ole file" msgstr "No &arquivo inteiro" -#: Merge.rc:859 +#: Merge.rc:861 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:860 +#: Merge.rc:862 #, c-format msgid "Replace &All" msgstr "Substituir &Tudo" -#: Merge.rc:867 -#: Merge.rc:2174 +#: Merge.rc:869 +#: Merge.rc:2177 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:870 +#: Merge.rc:872 #, c-format msgid "CheckOut" msgstr "Veja Isso" -#: Merge.rc:875 -#: Merge.rc:1187 +#: Merge.rc:877 +#: Merge.rc:1189 #, c-format msgid "Comments" msgstr "Coment\xE1rios" -#: Merge.rc:878 +#: Merge.rc:880 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ap\xF3s o checkout" -#: Merge.rc:884 +#: Merge.rc:886 #, c-format msgid "Linefilters" msgstr "Filtros das linhas" -#: Merge.rc:887 +#: Merge.rc:889 #, c-format msgid "Enable Line Filters" msgstr "Ativar os Filtros das Linhas" -#: Merge.rc:890 +#: Merge.rc:892 #, c-format msgid "Regular Expressions (one per line):" msgstr "Express\xF5es Regulares (uma por linha):" -#: Merge.rc:897 +#: Merge.rc:899 #, c-format msgid "Save" msgstr "Salvar" -#: Merge.rc:898 +#: Merge.rc:900 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:899 +#: Merge.rc:901 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:900 +#: Merge.rc:902 #, c-format msgid "Remove" msgstr "Remover" -#: Merge.rc:905 -#: Merge.rc:1934 +#: Merge.rc:907 +#: Merge.rc:1936 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:908 +#: Merge.rc:910 #, c-format msgid "Difference:" msgstr "Diferen\xE7a:" -#: Merge.rc:912 +#: Merge.rc:914 #, c-format msgid "Selected Difference:" msgstr "Diferen\xE7a Selecionada:" -#: Merge.rc:916 -#: Merge.rc:1577 +#: Merge.rc:918 +#: Merge.rc:1579 #, c-format msgid "Background" msgstr "2\xBA Plano" -#: Merge.rc:917 +#: Merge.rc:919 #, c-format msgid "Deleted" msgstr "Apagado" -#: Merge.rc:930 -#: Merge.rc:1372 -#: Merge.rc:1578 +#: Merge.rc:932 +#: Merge.rc:1374 +#: Merge.rc:1580 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:934 +#: Merge.rc:936 #, c-format msgid "Ignored Difference:" msgstr "Diferen\xE7a Ignorada:" -#: Merge.rc:944 +#: Merge.rc:946 #, c-format msgid "Moved:" msgstr "Movido:" -#: Merge.rc:954 +#: Merge.rc:956 #, c-format msgid "Selected Moved:" msgstr "Selecionado o Movido:" -#: Merge.rc:961 +#: Merge.rc:963 #, c-format msgid "Word Difference:" msgstr "Diferen\xE7a das Palavras:" -#: Merge.rc:968 +#: Merge.rc:970 #, c-format msgid "Selected Word Diff:" msgstr "Diferen\xE7a das Palavras Selecionadas:" -#: Merge.rc:975 -#: Merge.rc:1061 -#: Merge.rc:1090 -#: Merge.rc:1190 -#: Merge.rc:1418 +#: Merge.rc:977 +#: Merge.rc:1063 +#: Merge.rc:1092 +#: Merge.rc:1192 +#: Merge.rc:1420 #, c-format msgid "Defaults" msgstr "Padr\xF5es" -#: Merge.rc:981 -#: Merge.rc:1360 -#: Merge.rc:1566 +#: Merge.rc:983 +#: Merge.rc:1362 +#: Merge.rc:1568 #, c-format msgid "Dialog" msgstr "Di\xE1logo" -#: Merge.rc:991 -#: Merge.rc:1937 +#: Merge.rc:993 +#: Merge.rc:1939 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:994 +#: Merge.rc:996 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:996 +#: Merge.rc:998 #, c-format msgid "Integration" msgstr "Integra\xE7\xE3o" -#: Merge.rc:997 +#: Merge.rc:999 #, c-format msgid "&Add to explorer context menu" msgstr "&Adicionar ao menu de contexto do explorer" -#: Merge.rc:999 +#: Merge.rc:1001 #, c-format msgid "E&nable advanced menu" msgstr "A&tivar o menu avan\xE7ado" -#: Merge.rc:1001 +#: Merge.rc:1003 #, c-format msgid "In&clude subfolders by default" msgstr "In&cluir as sub-pastas por padr\xE3o" -#: Merge.rc:1003 +#: Merge.rc:1005 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:1006 +#: Merge.rc:1008 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:1008 +#: Merge.rc:1010 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:1009 +#: Merge.rc:1011 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos tempor\xE1rios" -#: Merge.rc:1010 +#: Merge.rc:1012 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta tempor\xE1ria do sistema" -#: Merge.rc:1012 +#: Merge.rc:1014 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1015 -#: Merge.rc:1031 +#: Merge.rc:1017 +#: Merge.rc:1033 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:1021 +#: Merge.rc:1023 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1024 +#: Merge.rc:1026 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1028 +#: Merge.rc:1030 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1032 +#: Merge.rc:1034 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1033 +#: Merge.rc:1035 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1035 +#: Merge.rc:1037 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1039 +#: Merge.rc:1041 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1040 +#: Merge.rc:1042 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1043 +#: Merge.rc:1045 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1046 +#: Merge.rc:1048 #, c-format msgid "W&hitespaces" msgstr "E&spa\xE7os em branco" -#: Merge.rc:1047 +#: Merge.rc:1049 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:1049 +#: Merge.rc:1051 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudan\xE7as" -#: Merge.rc:1051 +#: Merge.rc:1053 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:1053 +#: Merge.rc:1055 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1055 +#: Merge.rc:1057 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:1057 +#: Merge.rc:1059 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1059 +#: Merge.rc:1061 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1081 +#: Merge.rc:1083 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1087 +#: Merge.rc:1089 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1088 +#: Merge.rc:1090 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1098 +#: Merge.rc:1100 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1103 +#: Merge.rc:1105 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1106 +#: Merge.rc:1108 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o" -#: Merge.rc:1109 +#: Merge.rc:1111 #, c-format msgid "Extensions list:" msgstr "Lista das extens\xF5es:" -#: Merge.rc:1110 +#: Merge.rc:1112 #, c-format msgid "Description:" msgstr "Descri\xE7\xE3o:" -#: Merge.rc:1121 +#: Merge.rc:1123 #, c-format msgid " Folder Compare Progress" msgstr " Progresso da Compara\xE7\xE3o das Pastas" -#: Merge.rc:1124 -#: Merge.rc:1884 +#: Merge.rc:1126 +#: Merge.rc:1886 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1129 +#: Merge.rc:1131 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1130 +#: Merge.rc:1132 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1131 +#: Merge.rc:1133 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1137 +#: Merge.rc:1139 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1140 +#: Merge.rc:1142 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1142 +#: Merge.rc:1144 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1147 +#: Merge.rc:1149 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1148 +#: Merge.rc:1150 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1150 +#: Merge.rc:1152 #, c-format msgid "&Difference" msgstr "&Diferen\xE7a" -#: Merge.rc:1152 +#: Merge.rc:1154 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1158 -#: Merge.rc:1932 +#: Merge.rc:1160 +#: Merge.rc:1934 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1161 +#: Merge.rc:1163 #, c-format msgid "Whitespace" msgstr "Espa\xE7o em branco" -#: Merge.rc:1162 +#: Merge.rc:1164 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1164 +#: Merge.rc:1166 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudan\xE7a" -#: Merge.rc:1166 +#: Merge.rc:1168 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1168 +#: Merge.rc:1170 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1170 +#: Merge.rc:1172 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1172 +#: Merge.rc:1174 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:1175 +#: Merge.rc:1177 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos" -#: Merge.rc:1177 +#: Merge.rc:1179 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1179 +#: Merge.rc:1181 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos" -#: Merge.rc:1182 +#: Merge.rc:1184 #, c-format msgid "&File Compare method:" msgstr "&M\xE9todo para Comparar Arquivos:" -#: Merge.rc:1185 +#: Merge.rc:1187 #, c-format msgid "S&top after first difference" msgstr "P&arar ap\xF3s a primeira diferen\xE7a" -#: Merge.rc:1188 +#: Merge.rc:1190 #, c-format msgid "Filter Comments" msgstr "Coment\xE1rios do Filtro" -#: Merge.rc:1195 -#: Merge.rc:1933 +#: Merge.rc:1197 +#: Merge.rc:1935 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1198 +#: Merge.rc:1200 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1200 +#: Merge.rc:1202 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento autom\xE1tico" -#: Merge.rc:1202 +#: Merge.rc:1204 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1204 +#: Merge.rc:1206 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1205 +#: Merge.rc:1207 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1208 +#: Merge.rc:1210 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1210 +#: Merge.rc:1212 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espa\xE7os" -#: Merge.rc:1212 +#: Merge.rc:1214 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferen\xE7as das Linhas" -#: Merge.rc:1214 +#: Merge.rc:1216 #, c-format msgid "View line differences" msgstr "Visualizar as diferen\xE7as das linhas" -#: Merge.rc:1216 +#: Merge.rc:1218 #, c-format msgid "&Character level" msgstr "&N\xEDvel dos caracteres" -#: Merge.rc:1218 +#: Merge.rc:1220 #, c-format msgid "&Word-level:" msgstr "&N\xEDvel das palavras:" -#: Merge.rc:1233 +#: Merge.rc:1235 #, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1239 +#: Merge.rc:1241 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1240 +#: Merge.rc:1242 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1241 +#: Merge.rc:1243 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1242 +#: Merge.rc:1244 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1243 +#: Merge.rc:1245 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1249 +#: Merge.rc:1251 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1252 +#: Merge.rc:1254 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1255 +#: Merge.rc:1257 #, c-format msgid "&Save changes" msgstr "&Salvar mudan\xE7as" -#: Merge.rc:1257 +#: Merge.rc:1259 #, c-format msgid "&Discard changes" msgstr "&Descartar mudan\xE7as" -#: Merge.rc:1259 +#: Merge.rc:1261 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1262 +#: Merge.rc:1264 #, c-format msgid "S&ave changes" msgstr "S&alvar mudan\xE7as" -#: Merge.rc:1264 +#: Merge.rc:1266 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudan\xE7as" -#: Merge.rc:1266 +#: Merge.rc:1268 #, c-format msgid "Discard All" msgstr "Descartar Tudo" -#: Merge.rc:1273 -#: Merge.rc:1521 -#: Merge.rc:1939 +#: Merge.rc:1275 +#: Merge.rc:1523 +#: Merge.rc:1941 #, c-format msgid "Codepage" msgstr "C\xF3digo da p\xE1gina" -#: Merge.rc:1276 +#: Merge.rc:1278 #, c-format msgid "Default Codepage" msgstr "C\xF3digo da P\xE1gina Padr\xE3o" -#: Merge.rc:1277 +#: Merge.rc:1279 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:" -#: Merge.rc:1279 +#: Merge.rc:1281 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2057,56 +2062,56 @@ "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml \n" "precisa reiniciar a sess\xE3o" -#: Merge.rc:1282 +#: Merge.rc:1284 #, c-format msgid "System codepage" msgstr "C\xF3digo de p\xE1gina do sistema" -#: Merge.rc:1284 +#: Merge.rc:1286 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge" -#: Merge.rc:1286 +#: Merge.rc:1288 #, c-format msgid "Custom codepage:" msgstr "C\xF3digo de p\xE1gina personalizado:" -#: Merge.rc:1294 +#: Merge.rc:1296 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suporte para arquivos desativado" -#: Merge.rc:1297 +#: Merge.rc:1299 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)" -#: Merge.rc:1300 +#: Merge.rc:1302 #, 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 "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada." -#: Merge.rc:1302 +#: Merge.rc:1304 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho." -#: Merge.rc:1304 +#: Merge.rc:1306 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis." -#: Merge.rc:1306 +#: Merge.rc:1308 #, c-format msgid "Version" msgstr "Vers\xE3o" -#: Merge.rc:1308 +#: Merge.rc:1310 #, c-format msgid "" "Plugin required\n" @@ -2115,54 +2120,54 @@ "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1310 +#: Merge.rc:1312 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Vers\xE3o recomendada do 7-Zip:" -#: Merge.rc:1313 -#: Merge.rc:1316 +#: Merge.rc:1315 +#: Merge.rc:1318 #, c-format msgid "present" msgstr "atual" -#: Merge.rc:1314 +#: Merge.rc:1316 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1317 +#: Merge.rc:1319 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado no seu computador:" -#: Merge.rc:1319 -#: Merge.rc:1324 +#: Merge.rc:1321 +#: Merge.rc:1326 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1321 +#: Merge.rc:1323 #, c-format msgid "missing" msgstr "faltando" -#: Merge.rc:1322 +#: Merge.rc:1324 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:" -#: Merge.rc:1326 +#: Merge.rc:1328 #, c-format msgid "outdated" msgstr "desatualizado" -#: Merge.rc:1327 +#: Merge.rc:1329 #, c-format msgid "Plugins on path:" msgstr "Plugins no caminho:" -#: Merge.rc:1328 +#: Merge.rc:1330 #, c-format msgid "" "Don't display this &message again.\n" @@ -2171,499 +2176,499 @@ "N\xE3o exibir esta mensagem de novo.\n" "(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)" -#: Merge.rc:1332 +#: Merge.rc:1334 #, c-format msgid "Plugin Download" msgstr "Download do Plugin" -#: Merge.rc:1341 +#: Merge.rc:1343 #, c-format msgid "Options" msgstr "Op\xE7\xF5es" -#: Merge.rc:1352 +#: Merge.rc:1354 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1354 +#: Merge.rc:1356 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1355 +#: Merge.rc:1357 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1363 +#: Merge.rc:1365 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1364 +#: Merge.rc:1366 #, c-format msgid "Function names:" msgstr "Nomes das fun\xE7\xF5es:" -#: Merge.rc:1365 +#: Merge.rc:1367 #, c-format msgid "Comments:" msgstr "Coment\xE1rios:" -#: Merge.rc:1366 +#: Merge.rc:1368 #, c-format msgid "Numbers:" msgstr "N\xFAmeros:" -#: Merge.rc:1367 +#: Merge.rc:1369 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1368 +#: Merge.rc:1370 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1369 +#: Merge.rc:1371 #, c-format msgid "Preprocessor:" msgstr "Pr\xE9-processador:" -#: Merge.rc:1370 +#: Merge.rc:1372 #, c-format msgid "User 1:" msgstr "Usu\xE1rio 1:" -#: Merge.rc:1371 +#: Merge.rc:1373 #, c-format msgid "User 2:" msgstr "Usu\xE1rio 2:" -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 -#: Merge.rc:1406 -#: Merge.rc:1411 -#: Merge.rc:1416 +#: Merge.rc:1378 +#: Merge.rc:1383 +#: Merge.rc:1388 +#: Merge.rc:1393 +#: Merge.rc:1398 +#: Merge.rc:1403 +#: Merge.rc:1408 +#: Merge.rc:1413 +#: Merge.rc:1418 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1424 +#: Merge.rc:1426 #, c-format msgid "Folder Compare Report" msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas" -#: Merge.rc:1427 +#: Merge.rc:1429 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1430 -#: Merge.rc:1604 -#: Merge.rc:1608 -#: Merge.rc:1635 +#: Merge.rc:1432 +#: Merge.rc:1606 +#: Merge.rc:1610 +#: Merge.rc:1637 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1431 +#: Merge.rc:1433 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1434 +#: Merge.rc:1436 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a \xC1rea de Transfer\xEAncia" -#: Merge.rc:1442 +#: Merge.rc:1444 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1445 +#: Merge.rc:1447 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro voc\xEA quer criar?" -#: Merge.rc:1447 +#: Merge.rc:1449 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)" -#: Merge.rc:1449 +#: Merge.rc:1451 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)" -#: Merge.rc:1457 -#: Merge.rc:1940 +#: Merge.rc:1459 +#: Merge.rc:1942 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1460 +#: Merge.rc:1462 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:" -#: Merge.rc:1462 +#: Merge.rc:1464 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar o Plugin do 7-zip" -#: Merge.rc:1463 +#: Merge.rc:1465 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1465 +#: Merge.rc:1467 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usar 7-zip isolado se dispon\xEDvel" -#: Merge.rc:1468 +#: Merge.rc:1470 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sar 7-Zip local da pasta do WinMerge" -#: Merge.rc:1470 +#: Merge.rc:1472 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1478 +#: Merge.rc:1480 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estat\xEDsticas" -#: Merge.rc:1481 +#: Merge.rc:1483 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1482 +#: Merge.rc:1484 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1483 -#: Merge.rc:2328 +#: Merge.rc:1485 +#: Merge.rc:2331 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1484 +#: Merge.rc:1486 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1487 -#: Merge.rc:1506 +#: Merge.rc:1489 +#: Merge.rc:1508 #, c-format msgid "Binary:" msgstr "Bin\xE1rio:" -#: Merge.rc:1490 +#: Merge.rc:1492 #, c-format msgid "Unique" msgstr "\xDAnico" -#: Merge.rc:1491 +#: Merge.rc:1493 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1496 +#: Merge.rc:1498 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1501 -#: Merge.rc:2322 +#: Merge.rc:1503 +#: Merge.rc:2325 #, c-format msgid "Identical" msgstr "Id\xEAnticos" -#: Merge.rc:1510 +#: Merge.rc:1512 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1515 +#: Merge.rc:1517 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1524 +#: Merge.rc:1526 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1527 -#: Merge.rc:1530 +#: Merge.rc:1529 +#: Merge.rc:1532 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1531 +#: Merge.rc:1533 #, c-format msgid "Select Codepage for" msgstr "Selecionar o C\xF3digo da P\xE1gina para" -#: Merge.rc:1532 +#: Merge.rc:1534 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1534 -#: Merge.rc:1537 +#: Merge.rc:1536 +#: Merge.rc:1539 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1535 +#: Merge.rc:1537 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1538 +#: Merge.rc:1540 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos" -#: Merge.rc:1541 +#: Merge.rc:1543 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1542 -#: Merge.rc:1906 +#: Merge.rc:1544 +#: Merge.rc:1908 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1547 +#: Merge.rc:1549 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1550 +#: Merge.rc:1552 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1552 +#: Merge.rc:1554 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1554 +#: Merge.rc:1556 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1556 +#: Merge.rc:1558 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1560 +#: Merge.rc:1562 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1561 +#: Merge.rc:1563 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1569 +#: Merge.rc:1571 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1572 +#: Merge.rc:1574 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1574 +#: Merge.rc:1576 #, c-format msgid "Whitespace:" msgstr "Espa\xE7o vazio:" -#: Merge.rc:1575 +#: Merge.rc:1577 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1576 +#: Merge.rc:1578 #, c-format msgid "Selection:" msgstr "Sele\xE7\xE3o:" -#: Merge.rc:1599 +#: Merge.rc:1601 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1605 +#: Merge.rc:1607 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1609 +#: Merge.rc:1611 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1615 +#: Merge.rc:1617 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1616 +#: Merge.rc:1618 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1621 -#: Merge.rc:1941 +#: Merge.rc:1623 +#: Merge.rc:1943 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1624 +#: Merge.rc:1626 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1629 +#: Merge.rc:1631 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1630 +#: Merge.rc:1632 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1632 +#: Merge.rc:1634 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1636 +#: Merge.rc:1638 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1637 +#: Merge.rc:1639 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extens\xE3o .bak" -#: Merge.rc:1639 +#: Merge.rc:1641 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1646 -#: Merge.rc:2230 +#: Merge.rc:1648 +#: Merge.rc:2233 #, c-format msgid "Confirm Copy" msgstr "Confirmar a C\xF3pia" -#: Merge.rc:1650 +#: Merge.rc:1652 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?" -#: Merge.rc:1652 +#: Merge.rc:1654 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1655 +#: Merge.rc:1657 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1658 +#: Merge.rc:1660 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1659 +#: Merge.rc:1661 #, c-format msgid "No" msgstr "N\xE3o" -#: Merge.rc:1665 +#: Merge.rc:1667 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1668 +#: Merge.rc:1670 #, c-format msgid "&Enable plugins" msgstr "&Ativar plugins" #. StringFileInfo.Block -#: Merge.rc:1698 +#: Merge.rc:1700 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1714 +#: Merge.rc:1716 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1729 +#: Merge.rc:1731 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1735 +#: Merge.rc:1737 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1736 +#: Merge.rc:1738 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1737 +#: Merge.rc:1739 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1738 +#: Merge.rc:1740 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1739 +#: Merge.rc:1741 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1740 +#: Merge.rc:1742 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1746 +#: Merge.rc:1748 #, c-format msgid "" "Create empty documents\n" @@ -2672,7 +2677,7 @@ "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:1747 +#: Merge.rc:1749 #, c-format msgid "" "Open an existing document\n" @@ -2681,7 +2686,7 @@ "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1748 +#: Merge.rc:1750 #, c-format msgid "" "Close the active document\n" @@ -2690,7 +2695,7 @@ "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1749 +#: Merge.rc:1751 #, c-format msgid "" "Save the active document\n" @@ -2699,7 +2704,7 @@ "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:1750 +#: Merge.rc:1752 #, c-format msgid "" "Save the active document with a new name\n" @@ -2708,7 +2713,7 @@ "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:1751 +#: Merge.rc:1753 #, c-format msgid "" "Change the printing options\n" @@ -2717,7 +2722,7 @@ "Mudar as op\xE7\xF5es de impress\xE3o\n" "Configurar P\xE1gina" -#: Merge.rc:1752 +#: Merge.rc:1754 #, c-format msgid "" "Change the printer and printing options\n" @@ -2726,7 +2731,7 @@ "Mudar a impressora e as op\xE7\xF5es de impress\xE3o\n" "Configurar a impress\xE3o" -#: Merge.rc:1753 +#: Merge.rc:1755 #, c-format msgid "" "Print the active document\n" @@ -2735,7 +2740,7 @@ "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:1754 +#: Merge.rc:1756 #, c-format msgid "" "Display full pages\n" @@ -2744,27 +2749,27 @@ "Exibir p\xE1ginas completas\n" "Pr\xE9-Visualizar Impress\xE3o" -#: Merge.rc:1759 +#: Merge.rc:1761 #, c-format msgid "Make all hidden items visible again" msgstr "Tornar todos os itens escondidos vis\xEDveis de novo" -#: Merge.rc:1760 +#: Merge.rc:1762 #, c-format msgid "Toggle tree mode" msgstr "Ativar o modo \xE1rvore" -#: Merge.rc:1761 +#: Merge.rc:1763 #, c-format msgid "Expand all subfolders" msgstr "Expandir todas as sub-pastas" -#: Merge.rc:1762 +#: Merge.rc:1764 #, c-format msgid "Collapse all subfolders" msgstr "Retrair todas as sub-pastas" -#: Merge.rc:1768 +#: Merge.rc:1770 #, c-format msgid "" "Open project file\n" @@ -2773,32 +2778,32 @@ "Abrir o arquivo do projeto\n" "Arquivo do projeto (Ctrl+J)" -#: Merge.rc:1769 +#: Merge.rc:1771 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto" -#: Merge.rc:1770 +#: Merge.rc:1772 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto" -#: Merge.rc:1771 +#: Merge.rc:1773 #, c-format msgid "Project File" msgstr "Arquivo do Projeto" -#: Merge.rc:1772 +#: Merge.rc:1774 #, c-format msgid "Project file successfully loaded." msgstr "Arquivo do projeto carregado com sucesso." -#: Merge.rc:1773 +#: Merge.rc:1775 #, c-format msgid "Project file successfully saved." msgstr "Arquivo do projeto salvo com sucesso." -#: Merge.rc:1774 +#: Merge.rc:1776 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2807,7 +2812,7 @@ "Salvar os caminhos atuais e op\xE7\xF5es no arquivo do projeto\n" "Salvar o Arquivo do Projeto" -#: Merge.rc:1779 +#: Merge.rc:1781 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2816,7 +2821,7 @@ "Exibir as informa\xE7\xF5es do programa, n\xFAmero da vers\xE3o e copyright\n" "Sobre" -#: Merge.rc:1780 +#: Merge.rc:1782 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2825,8 +2830,6 @@ "Sair do aplicativo; alertar para salvar os documentos\n" "Sair" -#: Merge.rc:1786 -#: Merge.rc:1787 #: Merge.rc:1788 #: Merge.rc:1789 #: Merge.rc:1790 @@ -2841,11 +2844,13 @@ #: Merge.rc:1799 #: Merge.rc:1800 #: Merge.rc:1801 +#: Merge.rc:1802 +#: Merge.rc:1803 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:1806 +#: Merge.rc:1808 #, c-format msgid "" "Switch to the next window pane\n" @@ -2854,7 +2859,7 @@ "Troca para o pr\xF3ximo painel da janela\n" "Painel Seguinte" -#: Merge.rc:1807 +#: Merge.rc:1809 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2863,7 +2868,7 @@ "Troca de volta para o painel da janela anterior\n" "Painel Anterior" -#: Merge.rc:1813 +#: Merge.rc:1815 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2872,7 +2877,7 @@ "Organiza as janelas para que elas se sobreponham\n" "Janelas em Cascata" -#: Merge.rc:1814 +#: Merge.rc:1816 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2881,7 +2886,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas horizontalmente\n" "Janelas Lado a Lado Horizontalmente" -#: Merge.rc:1815 +#: Merge.rc:1817 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2890,7 +2895,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas verticalmente\n" "Janelas Lado a Lado Verticalmente" -#: Merge.rc:1821 +#: Merge.rc:1823 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2899,7 +2904,7 @@ "Copia a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Copiar" -#: Merge.rc:1822 +#: Merge.rc:1824 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2908,7 +2913,7 @@ "Corta a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Cortar" -#: Merge.rc:1823 +#: Merge.rc:1825 #, c-format msgid "" "Find the specified text\n" @@ -2917,7 +2922,7 @@ "Achar o texto especificado\n" "Achar" -#: Merge.rc:1824 +#: Merge.rc:1826 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2926,7 +2931,7 @@ "Inserir os conte\xFAdos da \xC1rea de Transfer\xEAncia\n" "Colar" -#: Merge.rc:1825 +#: Merge.rc:1827 #, c-format msgid "" "Repeat the last action\n" @@ -2935,7 +2940,7 @@ "Repetir a \xFAltima a\xE7\xE3o\n" "Repetir" -#: Merge.rc:1826 +#: Merge.rc:1828 #, c-format msgid "" "Replace specific text with different text\n" @@ -2944,7 +2949,7 @@ "Substitui o texto espec\xEDfico com um texto diferente\n" "Substituir" -#: Merge.rc:1827 +#: Merge.rc:1829 #, c-format msgid "" "Select the entire document\n" @@ -2953,7 +2958,7 @@ "Seleciona o documento inteiro\n" "Selecionar Tudo" -#: Merge.rc:1828 +#: Merge.rc:1830 #, c-format msgid "" "Undo the last action\n" @@ -2962,7 +2967,7 @@ "Desfazer a \xFAltima a\xE7\xE3o\n" "Desfazer" -#: Merge.rc:1829 +#: Merge.rc:1831 #, c-format msgid "" "Redo the previously undone action\n" @@ -2971,7 +2976,7 @@ "Refazer a a\xE7\xE3o desfeita anteriormente\n" "Refazer" -#: Merge.rc:1835 +#: Merge.rc:1837 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2980,7 +2985,7 @@ "Mostrar ou esconder a barra de ferramentas\n" "Ativar a Barra de Ferramentas" -#: Merge.rc:1836 +#: Merge.rc:1838 #, c-format msgid "" "Show or hide the status bar\n" @@ -2989,7 +2994,7 @@ "Mostrar ou esconder a barra de status\n" "Ativar a Barra de Status" -#: Merge.rc:1837 +#: Merge.rc:1839 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2998,7 +3003,7 @@ "Mostrar ou esconder a barra das abas\n" "Ativar a Barra das Abas" -#: Merge.rc:1838 +#: Merge.rc:1840 #, c-format msgid "" "Automatically resize panes\n" @@ -3007,57 +3012,57 @@ "Automaticamente redimensionar os pain\xE9is\n" "Trancar os Pain\xE9is" -#: Merge.rc:1844 +#: Merge.rc:1846 #, c-format msgid "Change the window size" msgstr "Mudar o tamanho da janela" -#: Merge.rc:1845 +#: Merge.rc:1847 #, c-format msgid "Change the window position" msgstr "Mudar a posi\xE7\xE3o da janela" -#: Merge.rc:1846 +#: Merge.rc:1848 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um \xEDcone" -#: Merge.rc:1847 +#: Merge.rc:1849 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho completo" -#: Merge.rc:1848 +#: Merge.rc:1850 #, c-format msgid "Switch to the next document window" msgstr "Trocar para a pr\xF3xima janela do documento" -#: Merge.rc:1849 +#: Merge.rc:1851 #, c-format msgid "Switch to the previous document window" msgstr "Trocar para a janela do documento anterior" -#: Merge.rc:1850 +#: Merge.rc:1852 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e alerta para salvar os documentos" -#: Merge.rc:1855 +#: Merge.rc:1857 #, c-format msgid "Restore the window to normal size" msgstr "Restaurar a janela para o tamanho normal" -#: Merge.rc:1856 +#: Merge.rc:1858 #, c-format msgid "Activate Task List" msgstr "Ativar a Lista de Tarefas" -#: Merge.rc:1857 +#: Merge.rc:1859 #, c-format msgid "Activate this window" msgstr "Ativar esta janela" -#: Merge.rc:1863 +#: Merge.rc:1865 #, c-format msgid "" "Close print preview mode\n" @@ -3066,7 +3071,7 @@ "Fechar o modo de pr\xE9-visualiza\xE7\xE3o da impress\xE3o\n" "Cancelar a Pr\xE9-Visualiza\xE7\xE3o" -#: Merge.rc:1870 +#: Merge.rc:1872 #, c-format msgid "" "\n" @@ -3085,7 +3090,7 @@ "WinMerge.FileCompare\n" "Compara\xE7\xE3o dos Arquivos do WinMerge" -#: Merge.rc:1871 +#: Merge.rc:1873 #, c-format msgid "" "\n" @@ -3104,23 +3109,23 @@ "WinMerge.FolderCompare\n" "Compara\xE7\xE3o das Pastas do WinMerge" -#: Merge.rc:1878 +#: Merge.rc:1880 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar os caracs. EOL originais" -#: Merge.rc:1885 +#: Merge.rc:1887 #, c-format msgid "Press any key" msgstr "Pressione qualquer tecla" -#: Merge.rc:1891 -#: Merge.rc:1892 +#: Merge.rc:1893 +#: Merge.rc:1894 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o direito no caminho para copiar" -#: Merge.rc:1898 +#: Merge.rc:1900 #, c-format msgid "" "Developers:\n" @@ -3129,152 +3134,157 @@ "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1899 +#: Merge.rc:1901 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este \xE9 um software livre e voc\xEA \xE9 bem vindo para redistribu\xED-lo sob certas circunst\xE2ncias; veja o GNU Licen\xE7a para o P\xFAblico em Geral no menu Ajuda para detalhes." -#: Merge.rc:1905 +#: Merge.rc:1907 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1907 +#: Merge.rc:1909 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:1908 +#: Merge.rc:1910 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:1909 +#: Merge.rc:1911 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:1910 +#: Merge.rc:1912 #, c-format msgid "Ignore &all" msgstr "Ignorar &tudo" -#: Merge.rc:1911 +#: Merge.rc:1913 #, c-format msgid "&Yes" msgstr "&Sim" -#: Merge.rc:1917 +#: Merge.rc:1919 #, c-format msgid "Yes to &all" msgstr "Sim para &todos" -#: Merge.rc:1918 +#: Merge.rc:1920 #, c-format msgid "&No" msgstr "&N\xE3o" -#: Merge.rc:1919 +#: Merge.rc:1921 #, c-format msgid "No to a&ll" msgstr "N\xE3o para t&odos" -#: Merge.rc:1920 +#: Merge.rc:1922 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:1921 +#: Merge.rc:1923 #, c-format msgid "&Skip" msgstr "&Pular" -#: Merge.rc:1922 +#: Merge.rc:1924 #, c-format msgid "Skip &all" msgstr "Pular &tudo" -#: Merge.rc:1924 +#: Merge.rc:1926 #, c-format msgid "Don't display this &message again." msgstr "N\xE3o exibir esta &mensagem de novo." -#: Merge.rc:1925 +#: Merge.rc:1927 #, c-format msgid "Don't ask this &question again." msgstr "N\xE3o perguntar esta &quest\xE3o de novo." -#: Merge.rc:1935 +#: Merge.rc:1937 #, c-format msgid "Syntax colors" msgstr "Cores da sintaxe" -#: Merge.rc:1936 +#: Merge.rc:1938 #, c-format msgid "Text Colors" msgstr "Cores do Texto" -#: Merge.rc:1938 +#: Merge.rc:1940 #, c-format msgid "Version Control" msgstr "Controle da Vers\xE3o" -#: Merge.rc:1948 +#: Merge.rc:1950 #, c-format msgid "To:" msgstr "Para:" -#: Merge.rc:1949 +#: Merge.rc:1951 #, c-format msgid "From left:" msgstr "Da esquerda:" -#: Merge.rc:1950 +#: Merge.rc:1952 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:1951 +#: Merge.rc:1953 #, c-format msgid "From right:" msgstr "Da direita:" -#: Merge.rc:1952 +#: Merge.rc:1954 #, c-format msgid "To right:" msgstr "Para a direita:" -#: Merge.rc:1958 +#: Merge.rc:1960 #, c-format msgid "Version %1" msgstr "Vers\xE3o %1" -#: Merge.rc:1959 +#: Merge.rc:1961 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1965 +#: Merge.rc:1962 #, c-format +msgid "X64" +msgstr "" + +#: Merge.rc:1968 +#, c-format msgid "Options (%1)" msgstr "Op\xE7\xF5es (%1)" -#: Merge.rc:1966 +#: Merge.rc:1969 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensagens agora ser\xE3o exibidas de novo." -#: Merge.rc:1967 +#: Merge.rc:1970 #, 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 "Modifica\xE7\xF5es foram feitas na sess\xE3o de compara\xE7\xE3o do arquivo atual. Algumas configura\xE7\xF5es podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o do arquivo atual seja reiniciada." -#: Merge.rc:1968 +#: Merge.rc:1971 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A mudan\xE7a da fonte selecionada n\xE3o ser\xE1 aplicada a qualquer das janelas das diferen\xE7as atualmente vis\xEDveis." -#: Merge.rc:1970 +#: Merge.rc:1973 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3285,7 +3295,7 @@ "\n" "Por favor use valores de 1 - %1." -#: Merge.rc:1972 +#: Merge.rc:1975 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3296,129 +3306,129 @@ "\n" "Por favor reinicie o WinMerge ap\xF3s o reset." -#: Merge.rc:1978 +#: Merge.rc:1981 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1979 +#: Merge.rc:1982 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1980 +#: Merge.rc:1983 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1981 +#: Merge.rc:1984 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1983 +#: Merge.rc:1986 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos das op\xE7\xF5es (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1989 +#: Merge.rc:1992 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1990 +#: Merge.rc:1993 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1991 +#: Merge.rc:1994 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1997 +#: Merge.rc:2000 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1998 +#: Merge.rc:2001 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1999 +#: Merge.rc:2002 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:2000 +#: Merge.rc:2003 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:2006 +#: Merge.rc:2009 #, c-format msgid "Full Contents" msgstr "Conte\xFAdos Completos" -#: Merge.rc:2007 +#: Merge.rc:2010 #, c-format msgid "Quick Contents" msgstr "Conte\xFAdos R\xE1pidos" -#: Merge.rc:2008 +#: Merge.rc:2011 #, c-format msgid "Modified Date" msgstr "Data Modificada" -#: Merge.rc:2009 +#: Merge.rc:2012 #, c-format msgid "Modified Date and Size" msgstr "Data e Tamanho Modificados" -#: Merge.rc:2010 +#: Merge.rc:2013 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:2016 -#: Merge.rc:2640 +#: Merge.rc:2019 +#: Merge.rc:2643 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2017 +#: Merge.rc:2020 #, c-format msgid "Location" msgstr "Local" -#: Merge.rc:2018 +#: Merge.rc:2021 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2019 +#: Merge.rc:2022 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2020 -#: Merge.rc:2642 +#: Merge.rc:2023 +#: Merge.rc:2645 #, c-format msgid "Description" msgstr "Descri\xE7\xE3o" -#: Merge.rc:2021 +#: Merge.rc:2024 #, c-format msgid "Select filename for new filter" msgstr "Selecionar o nome do arquivo para o novo filtro" -#: Merge.rc:2022 +#: Merge.rc:2025 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2024 +#: Merge.rc:2027 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3431,7 +3441,7 @@ "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:2026 +#: Merge.rc:2029 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3444,7 +3454,7 @@ "\n" "Por favor tenha certeza de que a pasta exista e \xE9 grav\xE1vel." -#: Merge.rc:2028 +#: Merge.rc:2031 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3455,7 +3465,7 @@ "\n" "Por favor selecione a pasta do filtro em Op\xE7\xF5es/Sistema." -#: Merge.rc:2030 +#: Merge.rc:2033 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3468,12 +3478,12 @@ "\n" "Talvez o arquivo seja somente-leitura?" -#: Merge.rc:2031 +#: Merge.rc:2034 #, c-format msgid "Locate filter file to install" msgstr "Localizar o filtro do arquivo para instalar" -#: Merge.rc:2033 +#: Merge.rc:2036 #, c-format msgid "" "Installing filter file failed.\n" @@ -3484,17 +3494,17 @@ "\n" "N\xE3o p\xF4de copiar o novo arquivo do filtro para a pasta do filtro." -#: Merge.rc:2035 +#: Merge.rc:2038 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo do filtro j\xE1 existe. Sobrescrever o filtro existente?" -#: Merge.rc:2041 +#: Merge.rc:2044 #, c-format msgid "Regular expression" msgstr "Express\xE3o regular" -#: Merge.rc:2047 +#: Merge.rc:2050 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3505,203 +3515,203 @@ "\n" "Se voc\xEA n\xE3o quer atualizar todas as compara\xE7\xF5es agora voc\xEA pode selecionar o N\xE3o e atualizar as compara\xE7\xF5es mais tarde." -#: Merge.rc:2054 +#: Merge.rc:2057 #, c-format msgid "&Path to SS.EXE:" msgstr "&Caminho para o SS.EXE:" -#: Merge.rc:2060 +#: Merge.rc:2063 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Compara\xE7\xE3o dos Pastas" -#: Merge.rc:2061 +#: Merge.rc:2064 #, c-format msgid "File Comparison" msgstr "Compara\xE7\xE3o de Arquivo" -#: Merge.rc:2062 +#: Merge.rc:2065 #, c-format msgid "Untitled left" msgstr "Sem t\xEDtulo a esquerda" -#: Merge.rc:2063 +#: Merge.rc:2066 #, c-format msgid "Untitled right" msgstr "Sem t\xEDtulo a direita" -#: Merge.rc:2064 +#: Merge.rc:2067 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2065 +#: Merge.rc:2068 #, c-format msgid "Mine File" msgstr "Meu Arquivo" -#: Merge.rc:2071 +#: Merge.rc:2074 #, c-format msgid "Scanning files..." msgstr "Escaneando arquivos..." -#: Merge.rc:2072 +#: Merge.rc:2075 #, c-format msgid "Opening selection" msgstr "Abrindo a sele\xE7\xE3o" -#: Merge.rc:2073 +#: Merge.rc:2076 #, c-format msgid "Copying Left to Right" msgstr "Copiando da Esquerda para a Direita" -#: Merge.rc:2074 +#: Merge.rc:2077 #, c-format msgid "Copying Right to Left" msgstr "Copiando da Direita para a Esquerda" -#: Merge.rc:2075 +#: Merge.rc:2078 #, c-format msgid "Copying All to Left" msgstr "Copiando Tudo para a Esquerda" -#: Merge.rc:2076 +#: Merge.rc:2079 #, c-format msgid "Copying All to Right" msgstr "Copiando Tudo para a Direita" -#: Merge.rc:2077 +#: Merge.rc:2080 #, c-format msgid "Copying files..." msgstr "Copiando os arquivos..." -#: Merge.rc:2078 +#: Merge.rc:2081 #, c-format msgid "Deleting files..." msgstr "Apagando os arquivos..." -#: Merge.rc:2079 +#: Merge.rc:2082 #, c-format msgid "Moving files..." msgstr "Movendo os arquivos..." -#: Merge.rc:2080 +#: Merge.rc:2083 #, c-format msgid "Creating the report..." msgstr "Criando o relat\xF3rio..." -#: Merge.rc:2081 +#: Merge.rc:2084 #, c-format msgid "Undoing the last operation..." msgstr "Desfazendo a \xFAltima opera\xE7\xE3o..." -#: Merge.rc:2082 +#: Merge.rc:2085 #, c-format msgid "Redoing the previous operation..." msgstr "Refazendo a opera\xE7\xE3o anterior" -#: Merge.rc:2088 +#: Merge.rc:2091 #, 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:2089 +#: Merge.rc:2092 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2090 +#: Merge.rc:2093 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Ch: %d/%d" -#: Merge.rc:2091 +#: Merge.rc:2094 #, c-format msgid "Merge" msgstr "Unir" -#: Merge.rc:2092 +#: Merge.rc:2095 #, c-format msgid "Difference %1 of %2" msgstr "Diferen\xE7a %1 de %2" -#: Merge.rc:2093 +#: Merge.rc:2096 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferen\xE7as Achadas" -#: Merge.rc:2094 +#: Merge.rc:2097 #, c-format msgid "1 Difference Found" msgstr "1 Diferen\xE7a Achada" #. Abbreviation from "Read Only" -#: Merge.rc:2095 +#: Merge.rc:2098 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2101 +#: Merge.rc:2104 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2102 +#: Merge.rc:2105 #, c-format msgid "Items: %1" msgstr "Itens: %1" -#: Merge.rc:2108 +#: Merge.rc:2111 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione duas pastas ou arquivos existentes para comparar" -#: Merge.rc:2109 +#: Merge.rc:2112 #, c-format msgid "Folder Selection" msgstr "Sele\xE7\xE3o de Pastas" -#: Merge.rc:2110 +#: Merge.rc:2113 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecione duas pastas ou dois arquivos para comparar." -#: Merge.rc:2111 +#: Merge.rc:2114 #, c-format msgid "Left path is invalid!" msgstr "O caminho esquerdo \xE9 inv\xE1lido!" -#: Merge.rc:2112 +#: Merge.rc:2115 #, c-format msgid "Right path is invalid!" msgstr "O caminho direito \xE9 inv\xE1lido!" -#: Merge.rc:2113 +#: Merge.rc:2116 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os caminhos s\xE3o inv\xE1lidos!" -#: Merge.rc:2114 +#: Merge.rc:2117 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolher dois arquivos para ativar a sele\xE7\xE3o do desempacotador." -#: Merge.rc:2115 +#: Merge.rc:2118 #, c-format msgid "Cannot compare file and folder!" msgstr "N\xE3o p\xF4de comparar o arquivo e a pasta!" -#: Merge.rc:2121 +#: Merge.rc:2124 #, c-format msgid "File not found: %1" msgstr "Arquivo n\xE3o achado: %1" -#: Merge.rc:2122 +#: Merge.rc:2125 #, c-format msgid "File not unpacked: %1" msgstr "Arquivo n\xE3o desempacotado: %1" -#: Merge.rc:2123 +#: Merge.rc:2126 #, c-format msgid "" "Cannot open file\n" @@ -3714,12 +3724,12 @@ "\n" "%2" -#: Merge.rc:2124 +#: Merge.rc:2127 #, c-format msgid "Failed to parse conflict file." msgstr "Falhou em analisar o arquivo do conflito." -#: Merge.rc:2125 +#: Merge.rc:2128 #, c-format msgid "" "The file\n" @@ -3730,32 +3740,32 @@ "%1\n" "n\xE3o \xE9 um arquivo de conflito." -#: Merge.rc:2131 +#: Merge.rc:2134 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2132 +#: Merge.rc:2135 #, c-format msgid "Save changes to %1?" msgstr "Salvar as mudan\xE7as em %1?" -#: Merge.rc:2133 +#: Merge.rc:2136 #, 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\xE1 marcado como somente-leitura. Voc\xEA gostaria de sobrescrever o arquivo somente-leitura ? (N\xE3o para salvar com um novo nome de arquivo.)" -#: Merge.rc:2134 +#: Merge.rc:2137 #, c-format msgid "Error checking destination writeability" msgstr "Erro ao verificar a habilidade de gravar no destino" -#: Merge.rc:2135 +#: Merge.rc:2138 #, c-format msgid "Error backing up file" msgstr "Erro ao fazer o backup do arquivo" -#: Merge.rc:2137 +#: Merge.rc:2140 #, c-format msgid "" "Unable to backup original file:\n" @@ -3768,7 +3778,7 @@ "\n" "Continuar de qualquer maneira?" -#: Merge.rc:2138 +#: Merge.rc:2141 #, c-format msgid "" "Saving file failed.\n" @@ -3785,7 +3795,7 @@ "\t-usar um nome de arquivo diferente (Pressione Ok)\n" "\t... [truncated message content] |
From: <ki...@us...> - 2009-01-15 18:52:05
|
Revision: 6333 http://winmerge.svn.sourceforge.net/winmerge/?rev=6333&view=rev Author: kimmov Date: 2009-01-15 18:51:52 +0000 (Thu, 15 Jan 2009) Log Message: ----------- Update PO files for 2.13.1 experimental release. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/French.po trunk/Src/Languages/Galician.po trunk/Src/Languages/German.po trunk/Src/Languages/Greek.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Japanese.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po trunk/Src/Languages/Ukrainian.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2009-01-15 18:47:15 UTC (rev 6332) +++ trunk/Src/Languages/Brazilian.po 2009-01-15 18:51:52 UTC (rev 6333) @@ -391,7 +391,7 @@ #: Merge.rc:175 #: Merge.rc:296 #: Merge.rc:484 -#: Merge.rc:1925 +#: Merge.rc:1934 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -722,7 +722,7 @@ msgstr "&Scripts" #: Merge.rc:370 -#: Merge.rc:2779 +#: Merge.rc:2790 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -924,15 +924,15 @@ msgstr "&Apagar" #: Merge.rc:523 -#: Merge.rc:1145 -#: Merge.rc:1527 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Esquerda" #: Merge.rc:524 -#: Merge.rc:1147 -#: Merge.rc:1530 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Direita" @@ -1084,17 +1084,17 @@ #: Merge.rc:674 #: Merge.rc:706 -#: Merge.rc:800 -#: Merge.rc:986 -#: Merge.rc:1064 -#: Merge.rc:1093 -#: Merge.rc:1103 -#: Merge.rc:1269 -#: Merge.rc:1333 -#: Merge.rc:1346 -#: Merge.rc:1438 -#: Merge.rc:1453 -#: Merge.rc:1675 +#: Merge.rc:798 +#: Merge.rc:984 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" @@ -1110,39 +1110,39 @@ msgstr "Selecionar Arquivos ou Pastas" #: Merge.rc:685 -#: Merge.rc:1604 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Esquerda:" #: Merge.rc:689 #: Merge.rc:750 -#: Merge.rc:1007 -#: Merge.rc:1029 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Procurar..." #: Merge.rc:690 -#: Merge.rc:1608 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Direita:" #: Merge.rc:694 -#: Merge.rc:1040 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." #: Merge.rc:695 -#: Merge.rc:1612 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtro:" #: Merge.rc:698 -#: Merge.rc:1614 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Selecionar..." @@ -1158,7 +1158,7 @@ msgstr "&Selecionar..." #: Merge.rc:703 -#: Merge.rc:1615 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" @@ -1170,25 +1170,25 @@ #: Merge.rc:707 #: Merge.rc:737 -#: Merge.rc:801 -#: Merge.rc:831 -#: Merge.rc:863 -#: Merge.rc:873 -#: Merge.rc:1065 -#: Merge.rc:1094 -#: Merge.rc:1104 -#: Merge.rc:1155 -#: Merge.rc:1270 -#: Merge.rc:1347 -#: Merge.rc:1439 -#: Merge.rc:1454 -#: Merge.rc:1676 +#: Merge.rc:799 +#: Merge.rc:829 +#: Merge.rc:861 +#: Merge.rc:871 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Cancelar" #: Merge.rc:708 -#: Merge.rc:1348 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Ajuda" @@ -1229,7 +1229,7 @@ msgstr "Link para o projeto VSS Destino" #: Merge.rc:733 -#: Merge.rc:878 +#: Merge.rc:876 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" @@ -1240,7 +1240,7 @@ msgstr "Veja Isso" #: Merge.rc:736 -#: Merge.rc:874 +#: Merge.rc:872 #, c-format msgid "Save As..." msgstr "Salvar Como..." @@ -1256,13 +1256,13 @@ msgstr "&Sistema de Vers\xF5es:" #: Merge.rc:748 -#: Merge.rc:2056 +#: Merge.rc:2066 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" #: Merge.rc:755 -#: Merge.rc:1933 +#: Merge.rc:1942 #, c-format msgid "General" msgstr "Geral" @@ -1304,756 +1304,731 @@ #: Merge.rc:775 #, c-format -msgid "Enable Shell &Context Menu" -msgstr "Ativar o Menu de &Contexto do Shell" - -#: Merge.rc:777 -#, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Mostrar o Di\xE1logo \"Selecionar Arquivos ou Pastas\" ao Iniciar" -#: Merge.rc:779 +#: Merge.rc:777 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-Conclus\xE3o do di\xE1logo-Abrir:" -#: Merge.rc:782 +#: Merge.rc:780 #, c-format msgid "Enable multiple compare windows for" msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para" -#: Merge.rc:784 -#: Merge.rc:1627 +#: Merge.rc:782 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" -#: Merge.rc:786 -#: Merge.rc:1629 +#: Merge.rc:784 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" -#: Merge.rc:788 +#: Merge.rc:786 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o bot\xE3o Resetar para tornar todas as caixas de mensagens vis\xEDveis de novo." -#: Merge.rc:790 +#: Merge.rc:788 #, c-format msgid "Reset" msgstr "Resetar" -#: Merge.rc:797 +#: Merge.rc:795 #, c-format msgid "Language" msgstr "Idiomas" -#: Merge.rc:804 +#: Merge.rc:802 #, c-format msgid "Available languages:" msgstr "Idiomas dispon\xEDveis:" -#: Merge.rc:810 +#: Merge.rc:808 #, c-format msgid "Find" msgstr "Achar" -#: Merge.rc:813 -#: Merge.rc:840 +#: Merge.rc:811 +#: Merge.rc:838 #, c-format msgid "Fi&nd what:" msgstr "Ac&har:" -#: Merge.rc:816 -#: Merge.rc:846 +#: Merge.rc:814 +#: Merge.rc:844 #, c-format msgid "Match &whole word only" msgstr "Combinar &apenas palavras inteiras" -#: Merge.rc:818 -#: Merge.rc:848 +#: Merge.rc:816 +#: Merge.rc:846 #, c-format msgid "Match &case" msgstr "Combinar &com o caso sensitivo" -#: Merge.rc:820 -#: Merge.rc:850 +#: Merge.rc:818 +#: Merge.rc:848 #, c-format msgid "Regular &expression" msgstr "Express&\xE3o regular" -#: Merge.rc:822 +#: Merge.rc:820 #, c-format msgid "D&on't wrap end of file" msgstr "N&\xE3o organizar o final do arquivo" -#: Merge.rc:825 +#: Merge.rc:823 #, c-format msgid "Direction" msgstr "Dire\xE7\xE3o" -#: Merge.rc:826 +#: Merge.rc:824 #, c-format msgid "&Up" msgstr "&Pra cima" -#: Merge.rc:828 +#: Merge.rc:826 #, c-format msgid "&Down" msgstr "&Pra baixo" -#: Merge.rc:830 -#: Merge.rc:860 +#: Merge.rc:828 +#: Merge.rc:858 #, c-format msgid "&Find Next" msgstr "&Achar o Pr\xF3ximo" -#: Merge.rc:837 +#: Merge.rc:835 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:843 +#: Merge.rc:841 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:852 +#: Merge.rc:850 #, c-format msgid "&Don't wrap end of file" msgstr "&N\xE3o organizar o final do arquivo" -#: Merge.rc:855 +#: Merge.rc:853 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:856 +#: Merge.rc:854 #, c-format msgid "&Selection" msgstr "&Sele\xE7\xE3o" -#: Merge.rc:858 +#: Merge.rc:856 #, c-format msgid "Wh&ole file" msgstr "No &arquivo inteiro" -#: Merge.rc:861 +#: Merge.rc:859 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:862 +#: Merge.rc:860 #, c-format msgid "Replace &All" msgstr "Substituir &Tudo" -#: Merge.rc:869 -#: Merge.rc:2177 +#: Merge.rc:867 +#: Merge.rc:2188 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:872 +#: Merge.rc:870 #, c-format msgid "CheckOut" msgstr "Veja Isso" -#: Merge.rc:877 -#: Merge.rc:1189 +#: Merge.rc:875 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Coment\xE1rios" -#: Merge.rc:880 +#: Merge.rc:878 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ap\xF3s o checkout" -#: Merge.rc:886 +#: Merge.rc:884 #, c-format msgid "Linefilters" msgstr "Filtros das linhas" -#: Merge.rc:889 +#: Merge.rc:887 #, c-format msgid "Enable Line Filters" msgstr "Ativar os Filtros das Linhas" -#: Merge.rc:892 +#: Merge.rc:890 #, c-format msgid "Regular Expressions (one per line):" msgstr "Express\xF5es Regulares (uma por linha):" -#: Merge.rc:899 +#: Merge.rc:897 #, c-format msgid "Save" msgstr "Salvar" -#: Merge.rc:900 +#: Merge.rc:898 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:901 +#: Merge.rc:899 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:902 +#: Merge.rc:900 #, c-format msgid "Remove" msgstr "Remover" -#: Merge.rc:907 -#: Merge.rc:1936 +#: Merge.rc:905 +#: Merge.rc:1945 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:910 +#: Merge.rc:908 #, c-format msgid "Difference:" msgstr "Diferen\xE7a:" -#: Merge.rc:914 +#: Merge.rc:912 #, c-format msgid "Selected Difference:" msgstr "Diferen\xE7a Selecionada:" -#: Merge.rc:918 -#: Merge.rc:1579 +#: Merge.rc:916 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "2\xBA Plano" -#: Merge.rc:919 +#: Merge.rc:917 #, c-format msgid "Deleted" msgstr "Apagado" -#: Merge.rc:932 -#: Merge.rc:1374 -#: Merge.rc:1580 +#: Merge.rc:930 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:936 +#: Merge.rc:934 #, c-format msgid "Ignored Difference:" msgstr "Diferen\xE7a Ignorada:" -#: Merge.rc:946 +#: Merge.rc:944 #, c-format msgid "Moved:" msgstr "Movido:" -#: Merge.rc:956 +#: Merge.rc:954 #, c-format msgid "Selected Moved:" msgstr "Selecionado o Movido:" -#: Merge.rc:963 +#: Merge.rc:961 #, c-format msgid "Word Difference:" msgstr "Diferen\xE7a das Palavras:" -#: Merge.rc:970 +#: Merge.rc:968 #, c-format msgid "Selected Word Diff:" msgstr "Diferen\xE7a das Palavras Selecionadas:" -#: Merge.rc:977 -#: Merge.rc:1063 -#: Merge.rc:1092 -#: Merge.rc:1192 -#: Merge.rc:1420 +#: Merge.rc:975 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Padr\xF5es" -#: Merge.rc:983 -#: Merge.rc:1362 -#: Merge.rc:1568 +#: Merge.rc:981 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Di\xE1logo" -#: Merge.rc:993 -#: Merge.rc:1939 +#: Merge.rc:991 +#: Merge.rc:1948 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:996 +#: Merge.rc:994 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:998 +#: Merge.rc:996 #, c-format -msgid "Integration" -msgstr "Integra\xE7\xE3o" - -#: Merge.rc:999 -#, c-format -msgid "&Add to explorer context menu" -msgstr "&Adicionar ao menu de contexto do explorer" - -#: Merge.rc:1001 -#, c-format -msgid "E&nable advanced menu" -msgstr "A&tivar o menu avan\xE7ado" - -#: Merge.rc:1003 -#, c-format -msgid "In&clude subfolders by default" -msgstr "In&cluir as sub-pastas por padr\xE3o" - -#: Merge.rc:1005 -#, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:1008 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:1010 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:1011 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos tempor\xE1rios" -#: Merge.rc:1012 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta tempor\xE1ria do sistema" -#: Merge.rc:1014 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1017 -#: Merge.rc:1033 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:1023 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1026 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1030 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1034 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1035 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1037 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1041 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1042 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1045 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1048 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "E&spa\xE7os em branco" -#: Merge.rc:1049 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:1051 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudan\xE7as" -#: Merge.rc:1053 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:1055 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1057 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:1059 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1061 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1083 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1089 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1090 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1100 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1105 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1108 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o" -#: Merge.rc:1111 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Lista das extens\xF5es:" -#: Merge.rc:1112 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Descri\xE7\xE3o:" -#: Merge.rc:1123 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " Progresso da Compara\xE7\xE3o das Pastas" -#: Merge.rc:1126 -#: Merge.rc:1886 +#: Merge.rc:1117 +#: Merge.rc:1895 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1131 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1132 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1133 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1139 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1142 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1144 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1149 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1150 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1152 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Diferen\xE7a" -#: Merge.rc:1154 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1160 -#: Merge.rc:1934 +#: Merge.rc:1151 +#: Merge.rc:1943 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1163 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Espa\xE7o em branco" -#: Merge.rc:1164 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1166 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudan\xE7a" -#: Merge.rc:1168 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1170 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1172 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1174 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:1177 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos" -#: Merge.rc:1179 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1181 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos" -#: Merge.rc:1184 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&M\xE9todo para Comparar Arquivos:" -#: Merge.rc:1187 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "P&arar ap\xF3s a primeira diferen\xE7a" -#: Merge.rc:1190 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Coment\xE1rios do Filtro" -#: Merge.rc:1197 -#: Merge.rc:1935 +#: Merge.rc:1188 +#: Merge.rc:1944 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1200 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1202 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento autom\xE1tico" -#: Merge.rc:1204 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1206 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1207 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1210 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1212 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espa\xE7os" -#: Merge.rc:1214 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferen\xE7as das Linhas" -#: Merge.rc:1216 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Visualizar as diferen\xE7as das linhas" -#: Merge.rc:1218 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "&N\xEDvel dos caracteres" -#: Merge.rc:1220 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "&N\xEDvel das palavras:" -#: Merge.rc:1235 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1241 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1242 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1243 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1244 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1245 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1251 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1254 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1257 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Salvar mudan\xE7as" -#: Merge.rc:1259 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Descartar mudan\xE7as" -#: Merge.rc:1261 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1264 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "S&alvar mudan\xE7as" -#: Merge.rc:1266 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudan\xE7as" -#: Merge.rc:1268 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Descartar Tudo" -#: Merge.rc:1275 -#: Merge.rc:1523 -#: Merge.rc:1941 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1950 #, c-format msgid "Codepage" msgstr "C\xF3digo da p\xE1gina" -#: Merge.rc:1278 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "C\xF3digo da P\xE1gina Padr\xE3o" -#: Merge.rc:1279 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:" -#: Merge.rc:1281 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2062,56 +2037,56 @@ "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml \n" "precisa reiniciar a sess\xE3o" -#: Merge.rc:1284 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "C\xF3digo de p\xE1gina do sistema" -#: Merge.rc:1286 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge" -#: Merge.rc:1288 +#: Merge.rc:1279 #, c-format msgid "Custom codepage:" msgstr "C\xF3digo de p\xE1gina personalizado:" -#: Merge.rc:1296 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suporte para arquivos desativado" -#: Merge.rc:1299 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)" -#: Merge.rc:1302 +#: Merge.rc:1293 #, 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 "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada." -#: Merge.rc:1304 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho." -#: Merge.rc:1306 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis." -#: Merge.rc:1308 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Vers\xE3o" -#: Merge.rc:1310 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2120,54 +2095,54 @@ "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1312 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Vers\xE3o recomendada do 7-Zip:" -#: Merge.rc:1315 -#: Merge.rc:1318 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "atual" -#: Merge.rc:1316 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1319 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado no seu computador:" -#: Merge.rc:1321 -#: Merge.rc:1326 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1323 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "faltando" -#: Merge.rc:1324 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:" -#: Merge.rc:1328 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "desatualizado" -#: Merge.rc:1329 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugins no caminho:" -#: Merge.rc:1330 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2176,499 +2151,535 @@ "N\xE3o exibir esta mensagem de novo.\n" "(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)" -#: Merge.rc:1334 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Download do Plugin" -#: Merge.rc:1343 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Op\xE7\xF5es" -#: Merge.rc:1354 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1356 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1357 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1365 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1366 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nomes das fun\xE7\xF5es:" -#: Merge.rc:1367 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Coment\xE1rios:" -#: Merge.rc:1368 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "N\xFAmeros:" -#: Merge.rc:1369 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1370 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1371 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Pr\xE9-processador:" -#: Merge.rc:1372 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Usu\xE1rio 1:" -#: Merge.rc:1373 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Usu\xE1rio 2:" -#: Merge.rc:1378 -#: Merge.rc:1383 -#: Merge.rc:1388 -#: Merge.rc:1393 -#: Merge.rc:1398 -#: Merge.rc:1403 -#: Merge.rc:1408 -#: Merge.rc:1413 -#: Merge.rc:1418 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1426 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas" -#: Merge.rc:1429 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1432 -#: Merge.rc:1606 -#: Merge.rc:1610 -#: Merge.rc:1637 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1433 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1436 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a \xC1rea de Transfer\xEAncia" -#: Merge.rc:1444 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1447 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro voc\xEA quer criar?" -#: Merge.rc:1449 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)" -#: Merge.rc:1451 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)" -#: Merge.rc:1459 -#: Merge.rc:1942 +#: Merge.rc:1450 +#: Merge.rc:1951 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1462 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:" -#: Merge.rc:1464 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar o Plugin do 7-zip" -#: Merge.rc:1465 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1467 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usar 7-zip isolado se dispon\xEDvel" -#: Merge.rc:1470 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sar 7-Zip local da pasta do WinMerge" -#: Merge.rc:1472 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1480 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estat\xEDsticas" -#: Merge.rc:1483 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1484 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1485 -#: Merge.rc:2331 +#: Merge.rc:1476 +#: Merge.rc:2342 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1486 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1489 -#: Merge.rc:1508 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Bin\xE1rio:" -#: Merge.rc:1492 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "\xDAnico" -#: Merge.rc:1493 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1498 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1503 -#: Merge.rc:2325 +#: Merge.rc:1494 +#: Merge.rc:2336 #, c-format msgid "Identical" msgstr "Id\xEAnticos" -#: Merge.rc:1512 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1517 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1526 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1529 -#: Merge.rc:1532 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1533 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Selecionar o C\xF3digo da P\xE1gina para" -#: Merge.rc:1534 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1536 -#: Merge.rc:1539 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1537 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1540 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos" -#: Merge.rc:1543 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1544 -#: Merge.rc:1908 +#: Merge.rc:1535 +#: Merge.rc:1917 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1549 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1552 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1554 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1556 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1558 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1562 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1563 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1571 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1574 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1576 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Espa\xE7o vazio:" -#: Merge.rc:1577 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1578 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Sele\xE7\xE3o:" -#: Merge.rc:1601 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1607 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1611 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1617 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1618 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1623 -#: Merge.rc:1943 +#: Merge.rc:1614 +#: Merge.rc:1952 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1626 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1631 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1632 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1634 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1638 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1639 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extens\xE3o .bak" -#: Merge.rc:1641 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1648 -#: Merge.rc:2233 +#: Merge.rc:1639 +#: Merge.rc:2244 #, c-format msgid "Confirm Copy" msgstr "Confirmar a C\xF3pia" -#: Merge.rc:1652 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?" -#: Merge.rc:1654 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1657 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1660 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1661 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "N\xE3o" -#: Merge.rc:1667 +#: Merge.rc:1658 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1670 +#: Merge.rc:1661 #, c-format msgid "&Enable plugins" msgstr "&Ativar plugins" +#: Merge.rc:1672 +#: Merge.rc:1953 +#, c-format +msgid "Shell Integration" +msgstr "" + +#: Merge.rc:1675 +#, c-format +msgid "Explorer" +msgstr "" + +#: Merge.rc:1676 +#, c-format +msgid "E&nable advanced menu" +msgstr "A&tivar o menu avan\xE7ado" + +#: Merge.rc:1678 +#, c-format +msgid "In&clude subfolders by default" +msgstr "In&cluir as sub-pastas por padr\xE3o" + +#: Merge.rc:1680 +#, c-format +msgid "&Add to context menu" +msgstr "" + +#: Merge.rc:1682 +#, c-format +msgid "Folder compare" +msgstr "" + +#: Merge.rc:1683 +#, c-format +msgid "Add &Shell menu to context menu" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1700 +#: Merge.rc:1709 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1716 +#: Merge.rc:1725 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1731 +#: Merge.rc:1740 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1737 +#: Merge.rc:1746 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1738 +#: Merge.rc:1747 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1739 +#: Merge.rc:1748 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1740 +#: Merge.rc:1749 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1741 +#: Merge.rc:1750 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1742 +#: Merge.rc:1751 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1748 +#: Merge.rc:1757 #, c-format msgid "" "Create empty documents\n" @@ -2677,7 +2688,7 @@ "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:1749 +#: Merge.rc:1758 #, c-format msgid "" "Open an existing document\n" @@ -2686,7 +2697,7 @@ "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1750 +#: Merge.rc:1759 #, c-format msgid "" "Close the active document\n" @@ -2695,7 +2706,7 @@ "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1751 +#: Merge.rc:1760 #, c-format msgid "" "Save the active document\n" @@ -2704,7 +2715,7 @@ "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:1752 +#: Merge.rc:1761 #, c-format msgid "" "Save the active document with a new name\n" @@ -2713,7 +2724,7 @@ "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:1753 +#: Merge.rc:1762 #, c-format msgid "" "Change the printing options\n" @@ -2722,7 +2733,7 @@ "Mudar as op\xE7\xF5es de impress\xE3o\n" "Configurar P\xE1gina" -#: Merge.rc:1754 +#: Merge.rc:1763 #, c-format msgid "" "Change the printer and printing options\n" @@ -2731,7 +2742,7 @@ "Mudar a impressora e as op\xE7\xF5es de impress\xE3o\n" "Configurar a impress\xE3o" -#: Merge.rc:1755 +#: Merge.rc:1764 #, c-format msgid "" "Print the active document\n" @@ -2740,7 +2751,7 @@ "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:1756 +#: Merge.rc:1765 #, c-format msgid "" "Display full pages\n" @@ -2749,27 +2760,27 @@ "Exibir p\xE1ginas completas\n" "Pr\xE9-Visualizar Impress\xE3o" -#: Merge.rc:1761 +#: Merge.rc:1770 #, c-format msgid "Make all hidden items visible again" msgstr "Tornar todos os itens escondidos vis\xEDveis de novo" -#: Merge.rc:1762 +#: Merge.rc:1771 #, c-format msgid "Toggle tree mode" msgstr "Ativar o modo \xE1rvore" -#: Merge.rc:1763 +#: Merge.rc:1772 #, c-format msgid "Expand all subfolders" msgstr "Expandir todas as sub-pastas" -#: Merge.rc:1764 +#: Merge.rc:1773 #, c-format msgid "Collapse all subfolders" msgstr "Retrair todas as sub-pastas" -#: Merge.rc:1770 +#: Merge.rc:1779 #, c-format msgid "" "Open project file\n" @@ -2778,32 +2789,32 @@ "Abrir o arquivo do projeto\n" "Arquivo do projeto (Ctrl+J)" -#: Merge.rc:1771 +#: Merge.rc:1780 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto" -#: Merge.rc:1772 +#: Merge.rc:1781 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto" -#: Merge.rc:1773 +#: Merge.rc:1782 #, c-format msgid "Project File" msgstr "Arquivo do Projeto" -#: Merge.rc:1774 +#: Merge.rc:1783 #, c-format msgid "Project file successfully loaded." msgstr "Arquivo do projeto carregado com sucesso." -#: Merge.rc:1775 +#: Merge.rc:1784 #, c-format msgid "Project file successfully saved." msgstr "Arquivo do projeto salvo com sucesso." -#: Merge.rc:1776 +#: Merge.rc:1785 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2812,7 +2823,7 @@ "Salvar os caminhos atuais e op\xE7\xF5es no arquivo do projeto\n" "Salvar o Arquivo do Projeto" -#: Merge.rc:1781 +#: Merge.rc:1790 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2821,7 +2832,7 @@ "Exibir as informa\xE7\xF5es do programa, n\xFAmero da vers\xE3o e copyright\n" "Sobre" -#: Merge.rc:1782 +#: Merge.rc:1791 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2830,15 +2841,6 @@ "Sair do aplicativo; alertar para salvar os documentos\n" "Sair" -#: Merge.rc:1788 -#: Merge.rc:1789 -#: Merge.rc:1790 -#: Merge.rc:1791 -#: Merge.rc:1792 -#: Merge.rc:1793 -#: Merge.rc:1794 -#: Merge.rc:1795 -#: Merge.rc:1796 #: Merge.rc:1797 #: Merge.rc:1798 #: Merge.rc:1799 @@ -2846,11 +2848,20 @@ #: Merge.rc:1801 #: Merge.rc:1802 #: Merge.rc:1803 +#: Merge.rc:1804 +#: Merge.rc:1805 +#: Merge.rc:1806 +#: Merge.rc:1807 +#: Merge.rc:1808 +#: Merge.rc:1809 +#: Merge.rc:1810 +#: Merge.rc:1811 +#: Merge.rc:1812 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:1808 +#: Merge.rc:1817 #, c-format msgid "" "Switch to the next window pane\n" @@ -2859,7 +2870,7 @@ "Troca para o pr\xF3ximo painel da janela\n" "Painel Seguinte" -#: Merge.rc:1809 +#: Merge.rc:1818 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2868,7 +2879,7 @@ "Troca de volta para o painel da janela anterior\n" "Painel Anterior" -#: Merge.rc:1815 +#: Merge.rc:1824 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2877,7 +2888,7 @@ "Organiza as janelas para que elas se sobreponham\n" "Janelas em Cascata" -#: Merge.rc:1816 +#: Merge.rc:1825 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2886,7 +2897,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas horizontalmente\n" "Janelas Lado a Lado Horizontalmente" -#: Merge.rc:1817 +#: Merge.rc:1826 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2895,7 +2906,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas verticalmente\n" "Janelas Lado a Lado Verticalmente" -#: Merge.rc:1823 +#: Merge.rc:1832 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2904,7 +2915,7 @@ "Copia a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Copiar" -#: Merge.rc:1824 +#: Merge.rc:1833 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2913,7 +2924,7 @@ "Corta a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Cortar" -#: Merge.rc:1825 +#: Merge.rc:1834 #, c-format msgid "" "Find the specified text\n" @@ -2922,7 +2933,7 @@ "Achar o texto especificado\n" "Achar" -#: Merge.rc:1826 +#: Merge.rc:1835 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2931,7 +2942,7 @@ "Inserir os conte\xFAdos da \xC1rea de Transfer\xEAncia\n" "Colar" -#: Merge.rc:1827 +#: Merge.rc:1836 #, c-format msgid "" "Repeat the last action\n" @@ -2940,7 +2951,7 @@ "Repetir a \xFAltima a\xE7\xE3o\n" "Repetir" -#: Merge.rc:1828 +#: Merge.rc:1837 #, c-format msgid "" "Replace specific text with different text\n" @@ -2949,7 +2960,7 @@ "Substitui o texto espec\xEDfico com um texto diferente\n" "Substituir" -#: Merge.rc:1829 +#: Merge.rc:1838 #, c-format msgid "" "Select the entire document\n" @@ -2958,7 +2969,7 @@ "Seleciona o documento inteiro\n" "Selecionar Tudo" -#: Merge.rc:1830 +#: Merge.rc:1839 #, c-format msgid "" "Undo the last action\n" @@ -2967,7 +2978,7 @@ "Desfazer a \xFAltima a\xE7\xE3o\n" "Desfazer" -#: Merge.rc:1831 +#: Merge.rc:1840 #, c-format msgid "" "Redo the previously undone action\n" @@ -2976,7 +2987,7 @@ "Refazer a a\xE7\xE3o desfeita anteriormente\n" "Refazer" -#: Merge.rc:1837 +#: Merge.rc:1846 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2985,7 +2996,7 @@ "Mostrar ou esconder a barra de ferramentas\n" "Ativar a Barra de Ferramentas" -#: Merge.rc:1838 +#: Merge.rc:1847 #, c-format msgid "" "Show or hide the status bar\n" @@ -2994,7 +3005,7 @@ "Mostrar ou esconder a barra de status\n" "Ativar a Barra de Status" -#: Merge.rc:1839 +#: Merge.rc:1848 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3003,7 +3014,7 @@ "Mostrar ou esconder a barra das abas\n" "Ativar a Barra das Abas" -#: Merge.rc:1840 +#: Merge.rc:1849 #, c-format msgid "" "Automatically resize panes\n" @@ -3012,57 +3023,57 @@ "Automaticamente redimensionar os pain\xE9is\n" "Trancar os Pain\xE9is" -#: Merge.rc:1846 +#: Merge.rc:1855 #, c-format msgid "Change the window size" msgstr "Mudar o tamanho da janela" -#: Merge.rc:1847 +#: Merge.rc:1856 #, c-format msgid "Change the window position" msgstr "Mudar a posi\xE7\xE3o da janela" -#: Merge.rc:1848 +#: Merge.rc:1857 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um \xEDcone" -#: Merge.rc:1849 +#: Merge.rc:1858 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho completo" -#: Merge.rc:1850 +#: Merge.rc:1859 #, c-format msgid "Switch to the next document window" msgstr "Trocar para a pr\xF3xima janela do documento" -#: Merge.rc:1851 +#: Merge.rc:1860 #, c-format msgid "Switch to the previous document window" msgstr "Trocar para a janela do documento anterior" -#: Merge.rc:1852 +#: Merge.rc:1861 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e alerta para salvar os documentos" -#: Merge.rc:1857 +#: Merge.rc:1866 #, c-format msgid "Restore the window to normal size" msgstr "Restaurar a janela para o tamanho normal" -#: Merge.rc:1858 +#: Merge.rc:1867 #, c-format msgid "Activate Task List" msgstr "Ativar a Lista de Tarefas" -#: Merge.rc:1859 +#: Merge.rc:1868 #, c-format msgid "Activate this window" msgstr "Ativar esta janela" -#: Merge.rc:1865 +#: Merge.rc:1874 #, c-format msgid "" "Close print preview mode\n" @@ -3071,7 +3082,7 @@ "Fechar o modo de pr\xE9-visualiza\xE7\xE3o da impress\xE3o\n" "Cancelar a Pr\xE9-Visualiza\xE7\xE3o" -#: Merge.rc:1872 +#: Merge.rc:1881 #, c-format msgid "" "\n" @@ -3090,7 +3101,7 @@ "WinMerge.FileCompare\n" "Compara\xE7\xE3o dos Arquivos do WinMerge" -#: Merge.rc:1873 +#: Merge.rc:1882 #, c-format msgid "" "\n" @@ -3109,23 +3120,23 @@ "WinMerge.FolderCompare\n" "Compara\xE7\xE3o das Pastas do WinMerge" -#: Merge.rc:1880 +#: Merge.rc:1889 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar os caracs. EOL originais" -#: Merge.rc:1887 +#: Merge.rc:1896 #, c-format msgid "Press any key" msgstr "Pressione qualquer tecla" -#: Merge.rc:1893 -#: Merge.rc:1894 +#: Merge.rc:1902 +#: Merge.rc:1903 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o direito no caminho para copiar" -#: Merge.rc:1900 +#: Merge.rc:1909 #, c-format msgid "" "Developers:\n" @@ -3134,157 +3145,157 @@ "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1901 +#: Merge.rc:1910 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este \xE9 um software livre e voc\xEA \xE9 bem vindo para redistribu\xED-lo sob certas circunst\xE2ncias; veja o GNU Licen\xE7a para o P\xFAblico em Geral no menu Ajuda para detalhes." -#: Merge.rc:1907 +#: Merge.rc:1916 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1909 +#: Merge.rc:1918 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:1910 +#: Merge.rc:1919 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:1911 +#: Merge.rc:1920 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:1912 +#: Merge.rc:1921 #, c-format msgid "Ignore &all" msgstr "Ignorar &tudo" -#: Merge.rc:1913 +#: Merge.rc:1922 #, c-format msgid "&Yes" msgstr "&Sim" -#: Merge.rc:1919 +#: Merge.rc:1928 #, c-format msgid "Yes to &all" msgstr "Sim para &todos" -#: Merge.rc:1920 +#: Merge.rc:1929 #, c-format msgid "&No" msgstr "&N\xE3o" -#: Merge.rc:1921 +#: Merge.rc:1930 #, c-format msgid "No to a&ll" msgstr "N\xE3o para t&odos" -#: Merge.rc:1922 +#: Merge.rc:1931 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:1923 +#: Merge.rc:1932 #, c-format msgid "&Skip" msgstr "&Pular" -#: Merge.rc:1924 +#: Merge.rc:1933 #, c-format msgid "Skip &all" msgstr "Pular &tudo" -#: Merge.rc:1926 +#: Merge.rc:1935 #, c-format msgid "Don't display this &message again." msgstr "N\xE3o exibir esta &mensagem de novo." -#: Merge.rc:1927 +#: Merge.rc:1936 #, c-format msgid "Don't ask this &question again." msgstr "N\xE3o perguntar esta &quest\xE3o de novo." -#: Merge.rc:1937 +#: Merge.rc:1946 #, c-format msgid "Syntax colors" msgstr "Cores da sintaxe" -#: Merge.rc:1938 +#: Merge.rc:1947 #, c-format msgid "Text Colors" msgstr "Cores do Texto" -#: Merge.rc:1940 +#: Merge.rc:1949 #, c-format msgid "Version Control" msgstr "Controle da Vers\xE3o" -#: Merge.rc:1950 +#: Merge.rc:1960 #, c-format msgid "To:" msgstr "Para:" -#: Merge.rc:1951 +#: Merge.rc:1961 #, c-format msgid "From left:" msgstr "Da esquerda:" -#: Merge.rc:1952 +#: Merge.rc:1962 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:1953 +#: Merge.rc:1963 #, c-format msgid "From right:" msgstr "Da direita:" -#: Merge.rc:1954 +#: Merge.rc:1964 #, c-format msgid "To right:" msgstr "Para a direita:" -#: Merge.rc:1960 +#: Merge.rc:1970 #, c-format msgid "Version %1" msgstr "Vers\xE3o %1" -#: Merge.rc:1961 +#: Merge.rc:1971 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1962 +#: Merge.rc:1972 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:1968 +#: Merge.rc:1978 #, c-format msgid "Options (%1)" msgstr "Op\xE7\xF5es (%1)" -#: Merge.rc:1969 +#: Merge.rc:1979 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensagens agora ser\xE3o exibidas de novo." -#: Merge.rc:1970 +#: Merge.rc:1980 #, 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 "Modifica\xE7\xF5es foram feitas na sess\xE3o de compara\xE7\xE3o do arquivo atual. Algumas configura\xE7\xF5es podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o do arquivo atual seja reiniciada." -#: Merge.rc:1971 +#: Merge.rc:1981 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A mudan\xE7a da fonte selecionada n\xE3o ser\xE1 aplicada a qualquer das janelas das diferen\xE7as atualmente vis\xEDveis." -#: Merge.rc:1973 +#: Merge.rc:1983 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3295,7 +3306,7 @@ "\n" "Por favor use valores de 1 - %1." -#: Merge.rc:1975 +#: Merge.rc:1985 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3306,129 +3317,129 @@ "\n" "Por favor reinicie o WinMerge ap\xF3s o reset." -#: Merge.rc:1981 +#: Merge.rc:1991 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1982 +#: Merge.rc:1992 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1983 +#: Merge.rc:1993 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1984 +#: Merge.rc:1994 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1986 +#: Merge.rc:1996 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos das op\xE7\xF5es (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2002 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1993 +#: Merge.rc:2003 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1994 +#: Merge.rc:2004 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2000 +#: Merge.rc:2010 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:2001 +#: Merge.rc:2011 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:2002 +#: Merge.rc:2012 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:2003 +#: Merge.rc:2013 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:2009 +#: Merge.rc:2019 #, c-format msgid "Full Contents" msgstr "Conte\xFAdos Completos" -#: Merge.rc:2010 +#: Merge.rc:2020 #, c-format msgid "Quick Contents" msgstr "Conte\xFAdos R\xE1pidos" -#: Merge.rc:2011 +#: Merge.rc:2021 #, c-format msgid "Modified Date" msgstr "Data Modificada" -#: Merge.rc:2012 +#: Merge.rc:2022 #, c-format msgid "Modified Date and Size" msgstr "Data e Tamanho Modificados" -#: Merge.rc:2013 +#: Merge.rc:2023 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:2019 -#: Merge.rc:2643 +#: Merge.rc:2029 +#: Merge.rc:2654 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2020 +#: Merge.rc:2030 #, c-format msgid "Location" msgstr "Local" -#: Merge.rc:2021 +#: Merge.rc:2031 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2022 +#: Merge.rc:2032 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2023 -#: Merge.rc:2645 +#: Merge.rc:2033 +#: Merge.rc:2656 #, c-format msgid "Description" msgstr "Descri\xE7\xE3o" -#: Merge.rc:2024 +#: Merge.rc:2034 #, c-format msgid "Select filename for new filter" msgstr "Selecionar o nome do arquivo para o novo filtro" -#: Merge.rc:2025 +#: Merge.rc:2035 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2027 +#: Merge.rc:2037 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3441,7 +3452,7 @@ "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:2029 +#: Merge.rc:2039 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3454,7 +3465,7 @@ "\n" "Por favor tenha certeza de que a pasta exista e \xE9 grav\xE1vel." -#: Merge.rc:2031 +#: Merge.rc:2041 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3465,7 +3476,7 @@ "\n" "Por favor selecione a pasta do filtro em Op\xE7\xF5es/Sistema." -#: Merge.rc:2033 +#: Merge.rc:2043 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3478,12 +3489,12 @@ "\n" "Talvez o arquivo seja somente-leitura?" -#: Merge.rc:2034 +#: Merge.rc:2044 #, c-format msgid "Locate filter file to install" msgstr "Localizar o filtro do arquivo para instalar" -#: Merge.rc:2036 +#: Merge.rc:2046 #, c-format msgid "" "Installing filter file failed.\n" @@ -3494,17 +3505,17 @@ "\n" "N\xE3o p\xF4de copiar o novo arquivo do filtro para a pasta do filtro." -#: Merge.rc:2038 +#: Merge.rc:2048 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo do filtro j\xE1 existe. Sobrescrever o filtro existente?" -#: Merge.rc:2044 +#: Merge.rc:2054 #, c-format msgid "Regular expression" msgstr "Express\xE3o regular" -#: Merge.rc:2050 +#: Merge.rc:2060 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3515,203 +3526,203 @@ "\n" "Se voc\xEA n\xE3o quer atualizar todas as compara\xE7\xF5es agora voc\xEA pode selecionar o N\xE3o e atualizar as compara\xE7\xF5es mais tarde." -#: Merge.rc:2057 +#: Merge.rc:2067 #, c-format msgid "&Path to SS.EXE:" msgstr "&Caminho para o SS.EXE:" -#: Merge.rc:2063 +#: Merge.rc:2073 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Compara\xE7\xE3o dos Pastas" -#: Merge.rc:2064 +#: Merge.rc:2074 #, c-format msgid "File Comparison" msgstr "Compara\xE7\xE3o de Arquivo" -#: Merge.rc:2065 +#: Merge.rc:2075 #, c-format msgid "Untitled left" msgstr "Sem t\xEDtulo a esquerda" -#: Merge.rc:2066 +#: Merge.rc:2076 #, c-format msgid "Untitled right" msgstr "Sem t\xEDtulo a direita" -#: Merge.rc:2067 +#: Merge.rc:2077 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2068 +#: Merge.rc:2078 #, c-format msgid "Mine File" msgstr "Meu Arquivo" -#: Merge.rc:2074 +#: Merge.rc:2084 #, c-format msgid "Scanning files..." msgstr "Escaneando arquivos..." -#: Merge.rc:2075 +#: Merge.rc:2085 #, c-format msgid "Opening selection" msgstr "Abrindo a sele\xE7\xE3o" -#: Merge.rc:2076 +#: Merge.rc:2086 #, c-format msgid "Copying Left to Right" msgstr "Copiando da Esquerda para a Direita" -#: Merge.rc:2077 +#: Merge.rc:2087 #, c-format msgid "Copying Right to Left" msgstr "Copiando da Direita para a Esquerda" -#: Merge.rc:2078 +#: Merge.rc:2088 #, c-format msgid "Copying All to Left" msgstr "Copiando Tudo para a Esquerda" -#: Merge.rc:2079 +#: Merge.rc:2089 #, c-format msgid "Copying All to Right" msgstr "Copiando Tudo para a Direita" -#: Merge.rc:2080 +#: Merge.rc:2090 #, c-format msgid "Copying files..." msgstr "Copiando os arquivos..." -#: Merge.rc:2081 +#: Merge.rc:2091 #, c-format msgid "Deleting files..." msgstr "Apagando os arquivos..." -#: Merge.rc:2082 +#: Merge.rc:2092 #, c-format msgid "Moving files..." msgstr "Movendo os arquivos..." -#: Merge.rc:2083 +#: Merge.rc:2093 #, c-format msgid "Creating the report..." msgstr "Criando o relat\xF3rio..." -#: Merge.rc:2084 +#: Merge.rc:2094 #, c-format msgid "Undoing the last operation..." msgstr "Desfazendo a \xFAltima opera\xE7\xE3o..." -#: Merge.rc:2085 +#: Merge.rc:2095 #, c-format msgid "Redoing the previous operation..." msgstr "Refazendo a opera\xE7\xE3o anterior" -#: Merge.rc:2091 +#: Merge.rc:2101 #, 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:2092 +#: Merge.rc:2102 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2093 +#: Merge.rc:2103 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Ch: %d/%d" -#: Merge.rc:2094 +#: Merge.rc:2104 #, c-format msgid "Merge" msgstr "Unir" -#: Merge.rc:2095 +#: Merge.rc:2105 #, c-format msgid "Difference %1 of %2" msgstr "Diferen\xE7a %1 de %2" -#: Merge.rc:2096 +#: Merge.rc:2106 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferen\xE7as Achadas" -#: Merge.rc:2097 +#: Merge.rc:2107 #, c-format msgid "1 Difference Found" msgstr "1 Diferen\xE7a Achada" #. Abbreviation from "Read Only" -#: Merge.rc:2098 +#: Merge.rc:2108 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2104 +#: Merge.rc:2114 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2105 +#: Merge.rc:2115 #, c-format msgid "Items: %1" msgstr "Itens: %1" -#: Merge.rc:2111 +#: Merge.rc:2121 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione duas pastas ou arquivos existentes para comparar" -#: Merge.rc:2112 +#: Merge.rc:2122 #, c-format msgid "Folder Selection" msgstr "Sele\xE7\xE3o de Pastas" -#: Merge.rc:2113 +#: Merge.rc:2123 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecione duas pastas ou dois arquivos para comparar." -#: Merge.rc:2114 +#: Merge.rc:2124 #, c-format msgid "Left path is invalid!" msgstr "O caminho esquerdo \xE9 inv\xE1lido!" -#: Merge.rc:2115 +#: Merge.rc:2125 #, c-format msgid "Right path is invalid!" msgstr "O caminho direito \xE9 inv\xE1lido!" -#: Merge.rc:2116 +#: Merge.rc:2126 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os caminhos s\xE3o inv\xE1lidos!" -#: Merge.rc:2117 +#: Merge.rc:2127 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolher dois arquivos para ativar a sele\xE7\xE3o do desempacotador." -#: Merge.rc:2118 +#: Merge.rc:2128 #, c-format msgid "Cannot compare file and folder!" msgstr "N\xE3o p\xF4de comparar o arquivo e a pasta!" -#: Merge.rc:2124 +#: Merge.rc:2134 #, c-format msgid "File not found: %1" msgstr "Arquivo n\xE3o achado: %1" -#: Merge.rc:2125 +#: Merge.rc:2135 #, c-format msgid "File not unpacked: %1" msgstr "Arquivo n\xE3o desempacotado: %1" -#: Merge.rc:2126 +#: Merge.rc:2136 #, c-format msgid "" "Cannot open file\n" @@ -3724,12 +3735,12 @@ "\n" "%2" -#: Merge.rc:2127 +#: Merge.rc:2137 #, c-format msgid "Failed to parse conflict file." msgstr "Falhou em analisar o arquivo do conflito." -#: Merge.rc:2128 +#: Merge.rc:2138 #, c-format msgid "" "The file\n" @@ -3740,32 +3751,32 @@ "%1\n" "n\xE3o \xE9 um arquivo de conflito." -#: Merge.rc:2134 +#: Merge.rc:2144 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2135 +#: ... [truncated message content] |
From: <ki...@us...> - 2009-02-17 17:28:32
|
Revision: 6478 http://winmerge.svn.sourceforge.net/winmerge/?rev=6478&view=rev Author: kimmov Date: 2009-02-17 17:28:23 +0000 (Tue, 17 Feb 2009) Log Message: ----------- Update PO files for 2.13.3 experimental release. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/Galician.po trunk/Src/Languages/Greek.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Brazilian.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3890,7 +3890,7 @@ msgid "" "The file\n" "%1\n" -"disappeared. Please save a copy of the file to continue." +"has disappeared. Please save a copy of the file to continue." msgstr "" "O arquivo\n" "%1\n" Modified: trunk/Src/Languages/Bulgarian.po =================================================================== --- trunk/Src/Languages/Bulgarian.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Bulgarian.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3823,7 +3823,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Catalan.po =================================================================== --- trunk/Src/Languages/Catalan.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Catalan.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3823,7 +3823,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/ChineseSimplified.po =================================================================== --- trunk/Src/Languages/ChineseSimplified.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/ChineseSimplified.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3820,7 +3820,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/ChineseTraditional.po =================================================================== --- trunk/Src/Languages/ChineseTraditional.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/ChineseTraditional.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3913,7 +3913,7 @@ msgid "" "The file\n" "%1\n" -"disappeared. Please save a copy of the file to continue." +"has disappeared. Please save a copy of the file to continue." msgstr "" "\xC0ɮ\xD7\n" "%1\n" Modified: trunk/Src/Languages/Czech.po =================================================================== --- trunk/Src/Languages/Czech.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Czech.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3821,7 +3821,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "Soubor\n%1\nse ztratil. Pro pokra\xE8ov\xE1n\xED pros\xEDm ulo\x9Ete kopii souboru." #: Merge.rc:2165 Modified: trunk/Src/Languages/Danish.po =================================================================== --- trunk/Src/Languages/Danish.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Danish.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3776,7 +3776,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Dutch.po =================================================================== --- trunk/Src/Languages/Dutch.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Dutch.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3891,7 +3891,7 @@ msgid "" "The file\n" "%1\n" -"disappeared. Please save a copy of the file to continue." +"has disappeared. Please save a copy of the file to continue." msgstr "" "Het bestand\n" "%1\n" Modified: trunk/Src/Languages/Galician.po =================================================================== --- trunk/Src/Languages/Galician.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Galician.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3876,7 +3876,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Greek.po =================================================================== --- trunk/Src/Languages/Greek.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Greek.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -2027,12 +2027,8 @@ #: Merge.rc:1272 #, c-format -msgid "" -"Detect codepage info for these files : .html, .rc, .xml \n" -"need to restart session" +msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -"\xC1\xED\xDF\xF7\xED\xE5\xF5\xF3\xE7 \xF0\xEB\xE7\xF1\xEF\xF6\xEF\xF1\xDF\xE1\xF2 \xEA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1\xF2 \xE5\xED\xF4\xFC\xF2 \xF4\xF9\xED \xE1\xEA\xEF\xEB\xEF\xFD\xE8\xF9\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED : .html, .rc, .xml \n" -"\xD7\xF1\xE5\xE9\xDC\xE6\xE5\xF4\xE1\xE9 \xE5\xF0\xE1\xED\xE5\xEA\xEA\xDF\xED\xE7\xF3\xE7 \xF4\xE7\xF2 \xE5\xF1\xE3\xE1\xF3\xDF\xE1\xF2" #: Merge.rc:1275 #, c-format @@ -2046,8 +2042,8 @@ #: Merge.rc:1279 #, c-format -msgid "Custom codepage :" -msgstr "\xD0\xF1\xEF\xF4\xE9\xEC\xFE\xEC\xE5\xED\xE7 \xEA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1:" +msgid "Custom codepage:" +msgstr "" #: Merge.rc:1287 #, c-format @@ -3523,8 +3519,8 @@ #: Merge.rc:2067 #, c-format -msgid "&Path to SS.EXE :" -msgstr "&\xC4\xE9\xE1\xE4\xF1\xEF\xEC\xDE \xF4\xEF\xF5 SS.EXE :" +msgid "&Path to SS.EXE:" +msgstr "" #: Merge.rc:2073 #, c-format @@ -3872,7 +3868,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Hungarian.po =================================================================== --- trunk/Src/Languages/Hungarian.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Hungarian.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3794,7 +3794,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Italian.po =================================================================== --- trunk/Src/Languages/Italian.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Italian.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3860,7 +3860,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Korean.po =================================================================== --- trunk/Src/Languages/Korean.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Korean.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3855,7 +3855,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Norwegian.po =================================================================== --- trunk/Src/Languages/Norwegian.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Norwegian.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3778,7 +3778,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Polish.po =================================================================== --- trunk/Src/Languages/Polish.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Polish.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3869,7 +3869,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Portuguese.po =================================================================== --- trunk/Src/Languages/Portuguese.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Portuguese.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3576,7 +3576,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Romanian.po =================================================================== --- trunk/Src/Languages/Romanian.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Romanian.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3870,7 +3870,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Russian.po =================================================================== --- trunk/Src/Languages/Russian.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Russian.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3869,7 +3869,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Slovak.po =================================================================== --- trunk/Src/Languages/Slovak.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Slovak.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3847,7 +3847,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Slovenian.po =================================================================== --- trunk/Src/Languages/Slovenian.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Slovenian.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3871,7 +3871,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Spanish.po =================================================================== --- trunk/Src/Languages/Spanish.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Spanish.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3828,7 +3828,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 Modified: trunk/Src/Languages/Swedish.po =================================================================== --- trunk/Src/Languages/Swedish.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Swedish.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3577,7 +3577,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "Filen\n%1\nfinns inte nu. Var god och spara en kopia av filen f\xF6r att forts\xE4tta." #: Merge.rc:2165 Modified: trunk/Src/Languages/Turkish.po =================================================================== --- trunk/Src/Languages/Turkish.po 2009-02-17 17:16:34 UTC (rev 6477) +++ trunk/Src/Languages/Turkish.po 2009-02-17 17:28:23 UTC (rev 6478) @@ -3699,7 +3699,7 @@ #: Merge.rc:2159 #, c-format -msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue." +msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" #: Merge.rc:2165 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2009-03-03 19:40:27
|
Revision: 6528 http://winmerge.svn.sourceforge.net/winmerge/?rev=6528&view=rev Author: kimmov Date: 2009-03-03 19:40:18 +0000 (Tue, 03 Mar 2009) Log Message: ----------- Update language PO files from latest POT file. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/French.po trunk/Src/Languages/Galician.po trunk/Src/Languages/German.po trunk/Src/Languages/Greek.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Japanese.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po trunk/Src/Languages/Ukrainian.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2009-03-03 19:20:23 UTC (rev 6527) +++ trunk/Src/Languages/Brazilian.po 2009-03-03 19:40:18 UTC (rev 6528) @@ -74,7 +74,7 @@ #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:509 +#: Merge.rc:512 #, c-format msgid "&Copy" msgstr "&Copiar" @@ -86,7 +86,7 @@ msgstr "&Colar" #: Merge.rc:84 -#: Merge.rc:590 +#: Merge.rc:593 #, c-format msgid "&Goto..." msgstr "&Ir para..." @@ -97,64 +97,64 @@ msgstr "Ab&rir" #: Merge.rc:88 -#: Merge.rc:532 -#: Merge.rc:538 +#: Merge.rc:535 +#: Merge.rc:541 #, c-format msgid "with &Registered Application" msgstr "com &o Aplicativo Registrado" #: Merge.rc:89 -#: Merge.rc:533 -#: Merge.rc:539 +#: Merge.rc:536 +#: Merge.rc:542 #, c-format msgid "with &External Editor" msgstr "com &o Editor Externo" #: Merge.rc:90 -#: Merge.rc:534 -#: Merge.rc:540 +#: Merge.rc:537 +#: Merge.rc:543 #, c-format msgid "&with..." msgstr "&com..." #: Merge.rc:110 -#: Merge.rc:191 -#: Merge.rc:312 +#: Merge.rc:194 +#: Merge.rc:315 #, c-format msgid "&File" msgstr "&Arquivo" #: Merge.rc:112 -#: Merge.rc:193 -#: Merge.rc:314 +#: Merge.rc:196 +#: Merge.rc:317 #, c-format msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:194 -#: Merge.rc:315 +#: Merge.rc:197 +#: Merge.rc:318 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" #: Merge.rc:114 -#: Merge.rc:195 -#: Merge.rc:316 +#: Merge.rc:198 +#: Merge.rc:319 #, c-format msgid "Op&en Conflict File..." msgstr "Ab&rir o Arquivo do Conflito..." #: Merge.rc:116 -#: Merge.rc:197 -#: Merge.rc:318 +#: Merge.rc:200 +#: Merge.rc:321 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir Pro&jeto...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:198 -#: Merge.rc:319 +#: Merge.rc:201 +#: Merge.rc:322 #, c-format msgid "Sa&ve Project..." msgstr "Sa&lvar Projeto..." @@ -165,1870 +165,1885 @@ msgstr "Projetos Recentes" #: Merge.rc:121 -#: Merge.rc:205 -#: Merge.rc:351 +#: Merge.rc:208 +#: Merge.rc:354 #, c-format msgid "E&xit" msgstr "S&air" #: Merge.rc:123 -#: Merge.rc:207 -#: Merge.rc:353 +#: Merge.rc:210 +#: Merge.rc:356 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:125 -#: Merge.rc:211 -#: Merge.rc:387 +#: Merge.rc:214 +#: Merge.rc:390 #, c-format msgid "&Options..." msgstr "&Op\xE7\xF5es..." #: Merge.rc:127 -#: Merge.rc:213 -#: Merge.rc:389 +#: Merge.rc:216 +#: Merge.rc:392 #, c-format msgid "&View" msgstr "&Visualizar" #: Merge.rc:129 -#: Merge.rc:228 -#: Merge.rc:391 +#: Merge.rc:231 +#: Merge.rc:394 #, c-format msgid "Select &Font..." msgstr "Selecionar a &Fonte..." #: Merge.rc:130 -#: Merge.rc:229 -#: Merge.rc:392 +#: Merge.rc:232 +#: Merge.rc:395 #, c-format msgid "Use Default F&ont" msgstr "Usar a Fonte P&adr\xE3o" #: Merge.rc:132 -#: Merge.rc:231 -#: Merge.rc:413 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "&Toolbar" msgstr "&Barra de ferramentas" #: Merge.rc:134 -#: Merge.rc:233 -#: Merge.rc:415 +#: Merge.rc:236 +#: Merge.rc:418 #, c-format msgid "&None" msgstr "&Nenhum" #: Merge.rc:135 -#: Merge.rc:234 -#: Merge.rc:416 +#: Merge.rc:237 +#: Merge.rc:419 #, c-format msgid "&Small" msgstr "&Pequeno" #: Merge.rc:136 -#: Merge.rc:235 -#: Merge.rc:417 +#: Merge.rc:238 +#: Merge.rc:420 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:138 -#: Merge.rc:237 -#: Merge.rc:419 +#: Merge.rc:240 +#: Merge.rc:422 #, c-format msgid "&Status Bar" msgstr "&Barra de Status" #: Merge.rc:139 -#: Merge.rc:238 -#: Merge.rc:420 +#: Merge.rc:241 +#: Merge.rc:423 #, c-format msgid "Ta&b Bar" msgstr "Ba&rra das Abas" #: Merge.rc:141 -#: Merge.rc:241 -#: Merge.rc:424 +#: Merge.rc:244 +#: Merge.rc:427 #, c-format msgid "&Language..." msgstr "&Idioma..." #: Merge.rc:143 -#: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:265 +#: Merge.rc:449 #, c-format msgid "&Tools" msgstr "&Ferramentas" #: Merge.rc:145 -#: Merge.rc:265 -#: Merge.rc:448 +#: Merge.rc:268 +#: Merge.rc:451 #, c-format msgid "&Filters..." msgstr "&Filtros..." #: Merge.rc:146 -#: Merge.rc:266 -#: Merge.rc:449 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Generate Patch..." msgstr "&Gerar Patch..." #: Merge.rc:148 -#: Merge.rc:269 -#: Merge.rc:452 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:150 -#: Merge.rc:271 -#: Merge.rc:454 +#: Merge.rc:274 +#: Merge.rc:457 #, c-format msgid "&List..." msgstr "&Lista..." #: Merge.rc:152 -#: Merge.rc:273 -#: Merge.rc:456 #, c-format -msgid "&Manual Unpacking" -msgstr "&Desempacotamento Manual" +msgid "Ma&nual Prediffer" +msgstr "" #: Merge.rc:153 -#: Merge.rc:274 -#: Merge.rc:457 #, c-format -msgid "&Automatic Unpacking" -msgstr "&Desempacotamento Autom\xE1tico" +msgid "A&utomatic Prediffer" +msgstr "" #: Merge.rc:155 #: Merge.rc:276 #: Merge.rc:459 #, c-format +msgid "&Manual Unpacking" +msgstr "&Desempacotamento Manual" + +#: Merge.rc:156 +#: Merge.rc:277 +#: Merge.rc:460 +#, c-format +msgid "&Automatic Unpacking" +msgstr "&Desempacotamento Autom\xE1tico" + +#: Merge.rc:158 +#: Merge.rc:279 +#: Merge.rc:462 +#, c-format msgid "&Edit with Unpacker" msgstr "&Editar com o Desempacotador" -#: Merge.rc:157 -#: Merge.rc:278 -#: Merge.rc:466 +#: Merge.rc:160 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Reload plugins" msgstr "&Recarregar plugins" -#: Merge.rc:159 -#: Merge.rc:280 -#: Merge.rc:468 +#: Merge.rc:162 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "&Debug" msgstr "&Debug" -#: Merge.rc:161 -#: Merge.rc:282 -#: Merge.rc:470 +#: Merge.rc:164 +#: Merge.rc:285 +#: Merge.rc:473 #, c-format msgid "&Load Config..." msgstr "&Carregar Config..." -#: Merge.rc:162 -#: Merge.rc:283 -#: Merge.rc:471 +#: Merge.rc:165 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "&Reset Options" msgstr "&Resetar as Op\xE7\xF5es" -#: Merge.rc:164 -#: Merge.rc:285 -#: Merge.rc:473 +#: Merge.rc:167 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "&Window" msgstr "&Janela" -#: Merge.rc:166 -#: Merge.rc:287 -#: Merge.rc:475 +#: Merge.rc:169 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "Cl&ose" msgstr "Fe&char" -#: Merge.rc:167 -#: Merge.rc:288 -#: Merge.rc:476 +#: Merge.rc:170 +#: Merge.rc:291 +#: Merge.rc:479 #, c-format msgid "Clo&se All" msgstr "Fec&har Tudo" -#: Merge.rc:169 -#: Merge.rc:290 -#: Merge.rc:478 +#: Merge.rc:172 +#: Merge.rc:293 +#: Merge.rc:481 #, c-format msgid "Change &Pane\tF6" msgstr "Mudar o &Painel\tF6" -#: Merge.rc:171 -#: Merge.rc:292 -#: Merge.rc:480 +#: Merge.rc:174 +#: Merge.rc:295 +#: Merge.rc:483 #, c-format msgid "Tile &Horizontally" msgstr "Lado a Lado &Horizontalmente" -#: Merge.rc:172 -#: Merge.rc:293 -#: Merge.rc:481 +#: Merge.rc:175 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "Tile &Vertically" msgstr "Lado a Lado &Verticalmente" -#: Merge.rc:173 -#: Merge.rc:294 -#: Merge.rc:482 +#: Merge.rc:176 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Cascade" msgstr "&Em Cascata" -#: Merge.rc:175 -#: Merge.rc:296 -#: Merge.rc:484 -#: Merge.rc:1934 +#: Merge.rc:178 +#: Merge.rc:299 +#: Merge.rc:487 +#: Merge.rc:1939 #, c-format msgid "&Help" msgstr "&Ajuda" -#: Merge.rc:177 -#: Merge.rc:298 -#: Merge.rc:486 +#: Merge.rc:180 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Ajuda do WinMerge\tF1" -#: Merge.rc:179 -#: Merge.rc:300 -#: Merge.rc:488 +#: Merge.rc:182 +#: Merge.rc:303 +#: Merge.rc:491 #, c-format msgid "R&elease Notes" msgstr "N&otas sobre o Lan\xE7amento" -#: Merge.rc:180 -#: Merge.rc:301 -#: Merge.rc:489 +#: Merge.rc:183 +#: Merge.rc:304 +#: Merge.rc:492 #, c-format msgid "&Translations" msgstr "&Tradu\xE7\xF5es" -#: Merge.rc:181 -#: Merge.rc:302 -#: Merge.rc:490 +#: Merge.rc:184 +#: Merge.rc:305 +#: Merge.rc:493 #, c-format msgid "C&onfiguration" msgstr "C&onfigura\xE7\xE3o" -#: Merge.rc:182 -#: Merge.rc:303 -#: Merge.rc:491 +#: Merge.rc:185 +#: Merge.rc:306 +#: Merge.rc:494 #, c-format msgid "A&rchive Support disabled..." msgstr "S&uporte para Arquivos desativado..." -#: Merge.rc:184 -#: Merge.rc:305 -#: Merge.rc:493 +#: Merge.rc:187 +#: Merge.rc:308 +#: Merge.rc:496 #, c-format msgid "&GNU General Public License" msgstr "&GNU Licen\xE7a para o P\xFAblico em Geral" -#: Merge.rc:185 -#: Merge.rc:306 -#: Merge.rc:494 +#: Merge.rc:188 +#: Merge.rc:309 +#: Merge.rc:497 #, c-format msgid "&About WinMerge..." msgstr "&Sobre o WinMerge..." -#: Merge.rc:200 -#: Merge.rc:337 +#: Merge.rc:203 +#: Merge.rc:340 #, c-format msgid "L&eft Read-only" msgstr "S&omente-Leitura a Esquerda" -#: Merge.rc:201 -#: Merge.rc:338 +#: Merge.rc:204 +#: Merge.rc:341 #, c-format msgid "Ri&ght Read-only" msgstr "S&omente-Leitura a Direita" -#: Merge.rc:203 +#: Merge.rc:206 #, c-format msgid "File En&coding" msgstr "Codifi&ca\xE7\xE3o do Arquivo" -#: Merge.rc:209 -#: Merge.rc:363 +#: Merge.rc:212 +#: Merge.rc:366 #, c-format msgid "Select &All\tCtrl+A" msgstr "Selecio&nar Tudo\tCtrl+A" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show &Identical Items" msgstr "Mostr&ar Itens Id\xEAnticos" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show &Different Items" msgstr "Mostr&ar Itens Diferentes" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostra&r os Itens \xDAnicos a Esquerda" -#: Merge.rc:218 +#: Merge.rc:221 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar &os Itens \xDAnicos a Direita" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show S&kipped Items" msgstr "Mostra&r os Itens Pulados" -#: Merge.rc:220 +#: Merge.rc:223 #, c-format msgid "S&how Binary Files" msgstr "M&ostrar Arquivos Bin\xE1rios" -#: Merge.rc:222 +#: Merge.rc:225 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar os &Itens Escondidos" -#: Merge.rc:224 +#: Merge.rc:227 #, c-format msgid "Tree &Mode" msgstr "Modo &\xC1rvore" -#: Merge.rc:225 +#: Merge.rc:228 #, c-format msgid "E&xpand All Subfolders" msgstr "E&xpandir Todas as Sub-Pastas" -#: Merge.rc:226 +#: Merge.rc:229 #, c-format msgid "&Collapse All Subfolders" msgstr "&Retrair Todas as Sub-Pastas" -#: Merge.rc:239 +#: Merge.rc:242 #, c-format msgid "Compa&re Statistics" msgstr "Compa&rar as Estat\xEDsticas" -#: Merge.rc:243 -#: Merge.rc:426 +#: Merge.rc:246 +#: Merge.rc:429 #, c-format msgid "Refre&sh\tF5" msgstr "Atuali&zar\tF5" -#: Merge.rc:244 +#: Merge.rc:247 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Atualizar os Selecionados\tCtrl+F5" -#: Merge.rc:246 -#: Merge.rc:428 +#: Merge.rc:249 +#: Merge.rc:431 #, c-format msgid "&Merge" msgstr "&Unir" -#: Merge.rc:248 +#: Merge.rc:251 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparar\tEnter" -#: Merge.rc:250 -#: Merge.rc:430 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Diferen\xE7a Seguinte\tAlt+Pra Baixo" -#: Merge.rc:251 -#: Merge.rc:431 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Diferen\xE7a Anterior\tAlt+Pra Cima" -#: Merge.rc:253 -#: Merge.rc:433 +#: Merge.rc:256 +#: Merge.rc:436 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Primeira Diferen\xE7a\tAlt+Home" -#: Merge.rc:254 -#: Merge.rc:434 +#: Merge.rc:257 +#: Merge.rc:437 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Diferen\xE7a Atual\tAlt+Enter" -#: Merge.rc:255 -#: Merge.rc:435 +#: Merge.rc:258 +#: Merge.rc:438 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&\xDAltima Diferen\xE7a\tAlt+End" -#: Merge.rc:257 -#: Merge.rc:437 +#: Merge.rc:260 +#: Merge.rc:440 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar p&ara a Direita\tAlt+Direita" -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:441 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar p&ara a Esquerda\tAlt+Esquerda" -#: Merge.rc:260 +#: Merge.rc:263 #, c-format msgid "&Delete\tDel" msgstr "&Apagar\tDel" -#: Merge.rc:264 -#: Merge.rc:563 +#: Merge.rc:267 +#: Merge.rc:566 #, c-format msgid "&Customize Columns..." msgstr "&Personalizar as Colunas..." -#: Merge.rc:267 -#: Merge.rc:450 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "Generate &Report..." msgstr "Gerar &Relat\xF3rio..." -#: Merge.rc:321 +#: Merge.rc:324 #, c-format msgid "&Save\tCtrl+S" msgstr "&Salvar\tCtrl+S" -#: Merge.rc:322 +#: Merge.rc:325 #, c-format msgid "Save &Left" msgstr "Salvar &a Esquerda" -#: Merge.rc:324 -#: Merge.rc:329 +#: Merge.rc:327 +#: Merge.rc:332 #, c-format msgid "&Save" msgstr "&Salvar" -#: Merge.rc:325 -#: Merge.rc:330 +#: Merge.rc:328 +#: Merge.rc:333 #, c-format msgid "Save &As..." msgstr "Salvar &Como..." -#: Merge.rc:327 +#: Merge.rc:330 #, c-format msgid "Save &Right" msgstr "Salvar &a Direita" -#: Merge.rc:333 +#: Merge.rc:336 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:334 +#: Merge.rc:337 #, c-format msgid "Page Se&tup" msgstr "Configu&ra\xE7\xE3o da P\xE1gina" -#: Merge.rc:335 +#: Merge.rc:338 #, c-format msgid "Print Previe&w" msgstr "Pr\xE9-Visualiz&a\xE7\xE3o da Impress\xE3o" -#: Merge.rc:340 +#: Merge.rc:343 #, c-format msgid "&Convert Line Endings to" msgstr "&Converter os Finais das Linhas para" -#: Merge.rc:342 +#: Merge.rc:345 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:343 +#: Merge.rc:346 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:344 +#: Merge.rc:347 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:347 +#: Merge.rc:350 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modo de Uni\xE3o\tF9" -#: Merge.rc:349 +#: Merge.rc:352 #, c-format msgid "&File Encoding..." msgstr "&Codifica\xE7\xE3o do Arquivo..." -#: Merge.rc:355 +#: Merge.rc:358 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfazer\tCtrl+Z" -#: Merge.rc:356 +#: Merge.rc:359 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refazer\tCtrl+Y" -#: Merge.rc:358 +#: Merge.rc:361 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Co&rtar\tCtrl+X" -#: Merge.rc:359 +#: Merge.rc:362 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:360 +#: Merge.rc:363 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Colar\tCtrl+V" -#: Merge.rc:362 +#: Merge.rc:365 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecionar a &Diferen\xE7a da Linha\tF4" -#: Merge.rc:365 +#: Merge.rc:368 #, c-format msgid "F&ind...\tCtrl+F" msgstr "A&char...\tCtrl+F" -#: Merge.rc:366 +#: Merge.rc:369 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Subst&ituir...\tCtrl+H" -#: Merge.rc:368 +#: Merge.rc:371 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:370 -#: Merge.rc:2790 +#: Merge.rc:373 +#: Merge.rc:2795 #, c-format msgid "< Empty >" msgstr "< Vazio >" -#: Merge.rc:373 +#: Merge.rc:376 #, c-format msgid "Advanced" msgstr "Avan\xE7ado" -#: Merge.rc:375 +#: Merge.rc:378 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copiar Com Os N\xFAmeros das Linhas\tCtrl+Shift+C" -#: Merge.rc:378 +#: Merge.rc:381 #, c-format msgid "&Bookmarks" msgstr "&Bookmarks" -#: Merge.rc:380 +#: Merge.rc:383 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Ativar o Bookmark\tCtrl+F2" -#: Merge.rc:381 +#: Merge.rc:384 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Bookmark Seguinte\tF2" -#: Merge.rc:382 +#: Merge.rc:385 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Bookmark Anterior\tShift+F2" -#: Merge.rc:383 +#: Merge.rc:386 #, c-format msgid "&Clear All Bookmarks" msgstr "&Limpar Todos os Bookmarks" -#: Merge.rc:385 +#: Merge.rc:388 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ir Para...\tCtrl+G" -#: Merge.rc:393 +#: Merge.rc:396 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:395 +#: Merge.rc:398 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Mais &Zoom\tCtrl++" -#: Merge.rc:396 +#: Merge.rc:399 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Menos &Zoom\tCtrl+-" #. Zoom to normal -#: Merge.rc:397 +#: Merge.rc:400 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:399 +#: Merge.rc:402 #, c-format msgid "Syntax Highlight" msgstr "Destacar a Sintaxe" -#: Merge.rc:404 +#: Merge.rc:407 #, c-format msgid "&Lock Panes" msgstr "&Trancar os Pain\xE9is" -#: Merge.rc:405 +#: Merge.rc:408 #, c-format msgid "&View Whitespace" msgstr "&Visualizar os Espa\xE7os em Branco" -#: Merge.rc:406 +#: Merge.rc:409 #, c-format msgid "Vie&w Line Differences" msgstr "Vis&ualizar as Diferen\xE7as das Linhas" -#: Merge.rc:407 +#: Merge.rc:410 #, c-format msgid "View Line &Numbers" msgstr "Visualizar &os N\xFAmeros das Linhas" -#: Merge.rc:408 +#: Merge.rc:411 #, c-format msgid "View &Margins" msgstr "Visual&izar as Margens" -#: Merge.rc:409 +#: Merge.rc:412 #, c-format msgid "W&rap Lines" msgstr "O&rganizar as Linhas" -#: Merge.rc:411 +#: Merge.rc:414 #, c-format msgid "Sw&ap Panes" msgstr "Tr&ocar os Pain\xE9is" -#: Merge.rc:421 +#: Merge.rc:424 #, c-format msgid "Diff &Pane" msgstr "Pain&el da Diferen\xE7a" -#: Merge.rc:422 +#: Merge.rc:425 #, c-format msgid "Lo&cation Pane" msgstr "Pa&inel de Localiza\xE7\xE3o" -#: Merge.rc:440 +#: Merge.rc:443 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiar para a Direita e Avan\xE7ar\tAlt+Ctrl+Direita" -#: Merge.rc:441 +#: Merge.rc:444 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar ¶ a Esquerda e Avan\xE7ar\tAlt+Ctrl+Esquerda" -#: Merge.rc:443 +#: Merge.rc:446 #, c-format msgid "Copy &All to Right" msgstr "Copiar &Tudo para a Direita" -#: Merge.rc:444 +#: Merge.rc:447 #, c-format msgid "Cop&y All to Left" msgstr "Cop&iar Tudo para a Esquerda" -#: Merge.rc:461 +#: Merge.rc:464 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:502 +#: Merge.rc:505 #, c-format msgid "Comp&are" msgstr "Comp&arar" -#: Merge.rc:503 +#: Merge.rc:506 #, c-format msgid "Co&mpare Special" msgstr "Co&mparar Especial" -#: Merge.rc:505 +#: Merge.rc:508 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:506 +#: Merge.rc:509 #, c-format msgid "&HEX" msgstr "&HEX" -#: Merge.rc:511 +#: Merge.rc:514 #, c-format msgid "&Left to Right" msgstr "&Esquerda para a Direita" -#: Merge.rc:512 +#: Merge.rc:515 #, c-format msgid "L&eft to..." msgstr "E&squerda para..." -#: Merge.rc:513 +#: Merge.rc:516 #, c-format msgid "&Right to Left" msgstr "&Direita para a Esquerda" -#: Merge.rc:514 +#: Merge.rc:517 #, c-format msgid "R&ight to..." msgstr "D&ireita para..." -#: Merge.rc:516 +#: Merge.rc:519 #, c-format msgid "&Move" msgstr "&Mover" -#: Merge.rc:518 +#: Merge.rc:521 #, c-format msgid "&Left to..." msgstr "&Esquerda para..." -#: Merge.rc:519 +#: Merge.rc:522 #, c-format msgid "&Right to..." msgstr "&Direita para..." -#: Merge.rc:521 +#: Merge.rc:524 #, c-format msgid "&Delete" msgstr "&Apagar" -#: Merge.rc:523 -#: Merge.rc:1136 -#: Merge.rc:1518 +#: Merge.rc:526 +#: Merge.rc:1139 +#: Merge.rc:1523 #, c-format msgid "&Left" msgstr "&Esquerda" -#: Merge.rc:524 -#: Merge.rc:1138 -#: Merge.rc:1521 +#: Merge.rc:527 +#: Merge.rc:1141 +#: Merge.rc:1526 #, c-format msgid "&Right" msgstr "&Direita" -#: Merge.rc:525 +#: Merge.rc:528 #, c-format msgid "&Both" msgstr "&Ambos" -#: Merge.rc:527 +#: Merge.rc:530 #, c-format msgid "Re&name" msgstr "Re&nomear" -#: Merge.rc:528 +#: Merge.rc:531 #, c-format msgid "&Hide Items" msgstr "&Esconder os Itens" -#: Merge.rc:530 +#: Merge.rc:533 #, c-format msgid "&Open Left" msgstr "&Abrir a Esquerda" -#: Merge.rc:536 +#: Merge.rc:539 #, c-format msgid "O&pen Right" msgstr "A&brir a Direita" -#: Merge.rc:543 +#: Merge.rc:546 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&iar os nomes dos caminhos" -#: Merge.rc:545 +#: Merge.rc:548 #, c-format msgid "&Left (%1 of %2)" msgstr "&Esquerda (%1 de %2)" -#: Merge.rc:546 +#: Merge.rc:549 #, c-format msgid "&Right (%1 of %2)" msgstr "&Direita (%1 de %\xA82)" -#: Merge.rc:547 +#: Merge.rc:550 #, c-format msgid "&Both (%1 of %2)" msgstr "&Ambos (%1 de %2)" -#: Merge.rc:549 +#: Merge.rc:552 #, c-format msgid "Copy &Filenames" msgstr "Copiar &os nomes dos arquivos" -#: Merge.rc:551 +#: Merge.rc:554 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:553 +#: Merge.rc:556 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Esquerda... (%1 de %2)" -#: Merge.rc:554 +#: Merge.rc:557 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Direita... (%1 de %2)" -#: Merge.rc:555 +#: Merge.rc:558 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Ambos... (%1 de %2)" -#: Merge.rc:556 +#: Merge.rc:559 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Diferen\xE7as... (%1 de %2)" -#: Merge.rc:559 +#: Merge.rc:562 #, c-format msgid "&Refresh" msgstr "&Atualizar" -#: Merge.rc:571 +#: Merge.rc:574 #, c-format msgid "&Copy Full Path" msgstr "&Copiar o Caminho Completo" -#: Merge.rc:572 +#: Merge.rc:575 #, c-format msgid "Copy &Filename" msgstr "Copiar &o nome do arquivo" -#: Merge.rc:578 +#: Merge.rc:581 #, c-format msgid "Prediffer Settings" msgstr "Configura\xE7\xF5es do Prediffer" -#: Merge.rc:580 +#: Merge.rc:583 #, c-format msgid "&No prediffer" msgstr "&Sem prediffer" -#: Merge.rc:581 +#: Merge.rc:584 #, c-format msgid "Auto prediffer" msgstr "Auto prediffer" -#: Merge.rc:589 +#: Merge.rc:592 #, c-format msgid "G&oto Diff" msgstr "I&r para a Diferen\xE7a" -#: Merge.rc:592 +#: Merge.rc:595 #, c-format msgid "&No Moved Blocks" msgstr "&Nenhum dos Blocos Movidos" -#: Merge.rc:593 +#: Merge.rc:596 #, c-format msgid "&All Moved Blocks" msgstr "&Todos os Blocos Movidos" -#: Merge.rc:594 +#: Merge.rc:597 #, c-format msgid "Moved Block for &Current Diff" msgstr "Bloco Movido par&a a Diferen\xE7a Atual" -#: Merge.rc:663 +#: Merge.rc:666 #, c-format msgid "About WinMerge" msgstr "Sobre o WinMerge" -#: Merge.rc:669 +#: Merge.rc:672 #, c-format msgid "(Private Build)" msgstr "(Build Privado)" -#: Merge.rc:670 +#: Merge.rc:673 #, c-format msgid "All rights reserved." msgstr "Todos os direitos reservados." -#: Merge.rc:671 +#: Merge.rc:674 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visitar a Home Page do WinMerge!" -#: Merge.rc:674 -#: Merge.rc:706 -#: Merge.rc:798 -#: Merge.rc:984 -#: Merge.rc:1055 -#: Merge.rc:1084 -#: Merge.rc:1094 -#: Merge.rc:1260 -#: Merge.rc:1324 -#: Merge.rc:1337 -#: Merge.rc:1429 -#: Merge.rc:1444 -#: Merge.rc:1666 +#: Merge.rc:677 +#: Merge.rc:709 +#: Merge.rc:801 +#: Merge.rc:987 +#: Merge.rc:1058 +#: Merge.rc:1087 +#: Merge.rc:1097 +#: Merge.rc:1265 +#: Merge.rc:1329 +#: Merge.rc:1342 +#: Merge.rc:1434 +#: Merge.rc:1449 +#: Merge.rc:1671 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:675 +#: Merge.rc:678 #, c-format msgid "Contributors" msgstr "Contribuidores" -#: Merge.rc:682 +#: Merge.rc:685 #, c-format msgid "Select Files or Folders" msgstr "Selecionar Arquivos ou Pastas" -#: Merge.rc:685 -#: Merge.rc:1595 +#: Merge.rc:688 +#: Merge.rc:1600 #, c-format msgid "&Left:" msgstr "&Esquerda:" -#: Merge.rc:689 -#: Merge.rc:750 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:692 +#: Merge.rc:753 +#: Merge.rc:1001 +#: Merge.rc:1023 #, c-format msgid "&Browse..." msgstr "&Procurar..." -#: Merge.rc:690 -#: Merge.rc:1599 +#: Merge.rc:693 +#: Merge.rc:1604 #, c-format msgid "&Right:" msgstr "&Direita:" -#: Merge.rc:694 -#: Merge.rc:1031 +#: Merge.rc:697 +#: Merge.rc:1034 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." -#: Merge.rc:695 -#: Merge.rc:1603 +#: Merge.rc:698 +#: Merge.rc:1608 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:698 -#: Merge.rc:1605 +#: Merge.rc:701 +#: Merge.rc:1610 #, c-format msgid "Select..." msgstr "Selecionar..." -#: Merge.rc:699 +#: Merge.rc:702 #, c-format msgid "&Unpacker:" msgstr "&Desempacotador:" -#: Merge.rc:702 +#: Merge.rc:705 #, c-format msgid "&Select..." msgstr "&Selecionar..." -#: Merge.rc:703 -#: Merge.rc:1606 +#: Merge.rc:706 +#: Merge.rc:1611 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" -#: Merge.rc:705 +#: Merge.rc:708 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:707 -#: Merge.rc:737 -#: Merge.rc:799 -#: Merge.rc:829 -#: Merge.rc:861 -#: Merge.rc:871 -#: Merge.rc:1056 -#: Merge.rc:1085 -#: Merge.rc:1095 -#: Merge.rc:1146 -#: Merge.rc:1261 -#: Merge.rc:1338 -#: Merge.rc:1430 -#: Merge.rc:1445 -#: Merge.rc:1667 +#: Merge.rc:710 +#: Merge.rc:740 +#: Merge.rc:802 +#: Merge.rc:832 +#: Merge.rc:864 +#: Merge.rc:874 +#: Merge.rc:1059 +#: Merge.rc:1088 +#: Merge.rc:1098 +#: Merge.rc:1149 +#: Merge.rc:1266 +#: Merge.rc:1343 +#: Merge.rc:1435 +#: Merge.rc:1450 +#: Merge.rc:1672 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:708 -#: Merge.rc:1339 +#: Merge.rc:711 +#: Merge.rc:1344 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:709 +#: Merge.rc:712 #, c-format msgid "Files or Folders to Compare" msgstr "Arquivos ou Pastas para Comparar" -#: Merge.rc:716 +#: Merge.rc:719 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:721 +#: Merge.rc:724 #, c-format msgid "Database:" msgstr "Base de dados:" -#: Merge.rc:724 +#: Merge.rc:727 #, c-format msgid "Project:" msgstr "Projeto:" -#: Merge.rc:727 +#: Merge.rc:730 #, c-format msgid "User:" msgstr "Usu\xE1rio:" -#: Merge.rc:729 +#: Merge.rc:732 #, c-format msgid "Password:" msgstr "Senha:" -#: Merge.rc:731 +#: Merge.rc:734 #, c-format msgid "Link to Destination VSS project" msgstr "Link para o projeto VSS Destino" -#: Merge.rc:733 -#: Merge.rc:876 +#: Merge.rc:736 +#: Merge.rc:879 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" -#: Merge.rc:735 +#: Merge.rc:738 #, c-format msgid "Check Out" msgstr "Veja Isso" -#: Merge.rc:736 -#: Merge.rc:872 +#: Merge.rc:739 +#: Merge.rc:875 #, c-format msgid "Save As..." msgstr "Salvar Como..." -#: Merge.rc:742 +#: Merge.rc:745 #, c-format msgid "Versioning System" msgstr "Sistema de Vers\xF5es" -#: Merge.rc:745 +#: Merge.rc:748 #, c-format msgid "&Versioning System:" msgstr "&Sistema de Vers\xF5es:" -#: Merge.rc:748 -#: Merge.rc:2066 +#: Merge.rc:751 +#: Merge.rc:2071 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" -#: Merge.rc:755 -#: Merge.rc:1942 +#: Merge.rc:758 +#: Merge.rc:1947 #, c-format msgid "General" msgstr "Geral" -#: Merge.rc:758 +#: Merge.rc:761 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automaticame&nte rolar para a primeira diferen\xE7a" -#: Merge.rc:761 +#: Merge.rc:764 #, c-format msgid "&Disable Splash Screen" msgstr "&Desativar a Tela de Inicializa\xE7\xE3o" -#: Merge.rc:763 +#: Merge.rc:766 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fe&char as janelas com o ESC" -#: Merge.rc:765 +#: Merge.rc:768 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Automaticamente verificar os caminhos no di\xE1logo-Abrir" -#: Merge.rc:768 +#: Merge.rc:771 #, c-format msgid "All&ow only one instance to run" msgstr "Per&mitir apenas uma inst\xE2ncia a executar" -#: Merge.rc:770 +#: Merge.rc:773 #, c-format msgid "As&k when closing multiple windows" msgstr "Pe&rguntar quando fechar m\xFAltiplas janelas" -#: Merge.rc:772 +#: Merge.rc:775 #, c-format msgid "&Preserve file time in file compare" msgstr "&Preservar a hora do arquivo na compara\xE7\xE3o dos arquivos" -#: Merge.rc:775 +#: Merge.rc:778 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Mostrar o Di\xE1logo \"Selecionar Arquivos ou Pastas\" ao Iniciar" -#: Merge.rc:777 +#: Merge.rc:780 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-Conclus\xE3o do di\xE1logo-Abrir:" -#: Merge.rc:780 +#: Merge.rc:783 #, c-format msgid "Enable multiple compare windows for" msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para" -#: Merge.rc:782 -#: Merge.rc:1618 +#: Merge.rc:785 +#: Merge.rc:1623 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" -#: Merge.rc:784 -#: Merge.rc:1620 +#: Merge.rc:787 +#: Merge.rc:1625 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" -#: Merge.rc:786 +#: Merge.rc:789 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o bot\xE3o Resetar para tornar todas as caixas de mensagens vis\xEDveis de novo." -#: Merge.rc:788 +#: Merge.rc:791 #, c-format msgid "Reset" msgstr "Resetar" -#: Merge.rc:795 +#: Merge.rc:798 #, c-format msgid "Language" msgstr "Idiomas" -#: Merge.rc:802 +#: Merge.rc:805 #, c-format msgid "Available languages:" msgstr "Idiomas dispon\xEDveis:" -#: Merge.rc:808 +#: Merge.rc:811 #, c-format msgid "Find" msgstr "Achar" -#: Merge.rc:811 -#: Merge.rc:838 +#: Merge.rc:814 +#: Merge.rc:841 #, c-format msgid "Fi&nd what:" msgstr "Ac&har:" -#: Merge.rc:814 -#: Merge.rc:844 +#: Merge.rc:817 +#: Merge.rc:847 #, c-format msgid "Match &whole word only" msgstr "Combinar &apenas palavras inteiras" -#: Merge.rc:816 -#: Merge.rc:846 +#: Merge.rc:819 +#: Merge.rc:849 #, c-format msgid "Match &case" msgstr "Combinar &com o caso sensitivo" -#: Merge.rc:818 -#: Merge.rc:848 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "Regular &expression" msgstr "Express&\xE3o regular" -#: Merge.rc:820 +#: Merge.rc:823 #, c-format msgid "D&on't wrap end of file" msgstr "N&\xE3o organizar o final do arquivo" -#: Merge.rc:823 +#: Merge.rc:826 #, c-format msgid "Direction" msgstr "Dire\xE7\xE3o" -#: Merge.rc:824 +#: Merge.rc:827 #, c-format msgid "&Up" msgstr "&Pra cima" -#: Merge.rc:826 +#: Merge.rc:829 #, c-format msgid "&Down" msgstr "&Pra baixo" -#: Merge.rc:828 -#: Merge.rc:858 +#: Merge.rc:831 +#: Merge.rc:861 #, c-format msgid "&Find Next" msgstr "&Achar o Pr\xF3ximo" -#: Merge.rc:835 +#: Merge.rc:838 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:841 +#: Merge.rc:844 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:850 +#: Merge.rc:853 #, c-format msgid "&Don't wrap end of file" msgstr "&N\xE3o organizar o final do arquivo" -#: Merge.rc:853 +#: Merge.rc:856 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:854 +#: Merge.rc:857 #, c-format msgid "&Selection" msgstr "&Sele\xE7\xE3o" -#: Merge.rc:856 +#: Merge.rc:859 #, c-format msgid "Wh&ole file" msgstr "No &arquivo inteiro" -#: Merge.rc:859 +#: Merge.rc:862 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:860 +#: Merge.rc:863 #, c-format msgid "Replace &All" msgstr "Substituir &Tudo" -#: Merge.rc:867 -#: Merge.rc:2188 +#: Merge.rc:870 +#: Merge.rc:2193 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:870 +#: Merge.rc:873 #, c-format msgid "CheckOut" msgstr "Veja Isso" -#: Merge.rc:875 -#: Merge.rc:1180 +#: Merge.rc:878 +#: Merge.rc:1183 #, c-format msgid "Comments" msgstr "Coment\xE1rios" -#: Merge.rc:878 +#: Merge.rc:881 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ap\xF3s o checkout" -#: Merge.rc:884 +#: Merge.rc:887 #, c-format msgid "Linefilters" msgstr "Filtros das linhas" -#: Merge.rc:887 +#: Merge.rc:890 #, c-format msgid "Enable Line Filters" msgstr "Ativar os Filtros das Linhas" -#: Merge.rc:890 +#: Merge.rc:893 #, c-format msgid "Regular Expressions (one per line):" msgstr "Express\xF5es Regulares (uma por linha):" -#: Merge.rc:897 +#: Merge.rc:900 #, c-format msgid "Save" msgstr "Salvar" -#: Merge.rc:898 +#: Merge.rc:901 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:899 +#: Merge.rc:902 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:900 +#: Merge.rc:903 #, c-format msgid "Remove" msgstr "Remover" -#: Merge.rc:905 -#: Merge.rc:1945 +#: Merge.rc:908 +#: Merge.rc:1950 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:908 +#: Merge.rc:911 #, c-format msgid "Difference:" msgstr "Diferen\xE7a:" -#: Merge.rc:912 +#: Merge.rc:915 #, c-format msgid "Selected Difference:" msgstr "Diferen\xE7a Selecionada:" -#: Merge.rc:916 -#: Merge.rc:1570 +#: Merge.rc:919 +#: Merge.rc:1575 #, c-format msgid "Background" msgstr "2\xBA Plano" -#: Merge.rc:917 +#: Merge.rc:920 #, c-format msgid "Deleted" msgstr "Apagado" -#: Merge.rc:930 -#: Merge.rc:1365 -#: Merge.rc:1571 +#: Merge.rc:933 +#: Merge.rc:1370 +#: Merge.rc:1576 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:934 +#: Merge.rc:937 #, c-format msgid "Ignored Difference:" msgstr "Diferen\xE7a Ignorada:" -#: Merge.rc:944 +#: Merge.rc:947 #, c-format msgid "Moved:" msgstr "Movido:" -#: Merge.rc:954 +#: Merge.rc:957 #, c-format msgid "Selected Moved:" msgstr "Selecionado o Movido:" -#: Merge.rc:961 +#: Merge.rc:964 #, c-format msgid "Word Difference:" msgstr "Diferen\xE7a das Palavras:" -#: Merge.rc:968 +#: Merge.rc:971 #, c-format msgid "Selected Word Diff:" msgstr "Diferen\xE7a das Palavras Selecionadas:" -#: Merge.rc:975 -#: Merge.rc:1054 -#: Merge.rc:1083 -#: Merge.rc:1183 -#: Merge.rc:1411 +#: Merge.rc:978 +#: Merge.rc:1057 +#: Merge.rc:1086 +#: Merge.rc:1186 +#: Merge.rc:1416 #, c-format msgid "Defaults" msgstr "Padr\xF5es" -#: Merge.rc:981 -#: Merge.rc:1353 -#: Merge.rc:1559 +#: Merge.rc:984 +#: Merge.rc:1358 +#: Merge.rc:1564 #, c-format msgid "Dialog" msgstr "Di\xE1logo" -#: Merge.rc:991 -#: Merge.rc:1948 +#: Merge.rc:994 +#: Merge.rc:1953 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:994 +#: Merge.rc:997 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:996 +#: Merge.rc:999 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:999 +#: Merge.rc:1002 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:1001 +#: Merge.rc:1004 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:1002 +#: Merge.rc:1005 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos tempor\xE1rios" -#: Merge.rc:1003 +#: Merge.rc:1006 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta tempor\xE1ria do sistema" -#: Merge.rc:1005 +#: Merge.rc:1008 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1008 -#: Merge.rc:1024 +#: Merge.rc:1011 +#: Merge.rc:1027 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:1014 +#: Merge.rc:1017 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1017 +#: Merge.rc:1020 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1021 +#: Merge.rc:1024 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1025 +#: Merge.rc:1028 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1026 +#: Merge.rc:1029 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1028 +#: Merge.rc:1031 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1032 +#: Merge.rc:1035 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1033 +#: Merge.rc:1036 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1036 +#: Merge.rc:1039 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1039 +#: Merge.rc:1042 #, c-format msgid "W&hitespaces" msgstr "E&spa\xE7os em branco" -#: Merge.rc:1040 +#: Merge.rc:1043 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:1042 +#: Merge.rc:1045 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudan\xE7as" -#: Merge.rc:1044 +#: Merge.rc:1047 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:1046 +#: Merge.rc:1049 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1048 +#: Merge.rc:1051 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:1050 +#: Merge.rc:1053 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1052 +#: Merge.rc:1055 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1074 +#: Merge.rc:1077 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1080 +#: Merge.rc:1083 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1081 +#: Merge.rc:1084 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1091 +#: Merge.rc:1094 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1096 +#: Merge.rc:1099 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1099 +#: Merge.rc:1102 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o" -#: Merge.rc:1102 +#: Merge.rc:1105 #, c-format msgid "Extensions list:" msgstr "Lista das extens\xF5es:" -#: Merge.rc:1103 +#: Merge.rc:1106 #, c-format msgid "Description:" msgstr "Descri\xE7\xE3o:" -#: Merge.rc:1114 +#: Merge.rc:1117 #, c-format msgid " Folder Compare Progress" msgstr " Progresso da Compara\xE7\xE3o das Pastas" -#: Merge.rc:1117 -#: Merge.rc:1895 +#: Merge.rc:1120 +#: Merge.rc:1900 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1122 +#: Merge.rc:1125 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1123 +#: Merge.rc:1126 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1124 +#: Merge.rc:1127 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1130 +#: Merge.rc:1133 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1133 +#: Merge.rc:1136 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1135 +#: Merge.rc:1138 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1140 +#: Merge.rc:1143 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1141 +#: Merge.rc:1144 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1143 +#: Merge.rc:1146 #, c-format msgid "&Difference" msgstr "&Diferen\xE7a" -#: Merge.rc:1145 +#: Merge.rc:1148 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1151 -#: Merge.rc:1943 +#: Merge.rc:1154 +#: Merge.rc:1948 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1154 +#: Merge.rc:1157 #, c-format msgid "Whitespace" msgstr "Espa\xE7o em branco" -#: Merge.rc:1155 +#: Merge.rc:1158 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1157 +#: Merge.rc:1160 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudan\xE7a" -#: Merge.rc:1159 +#: Merge.rc:1162 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1161 +#: Merge.rc:1164 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1163 +#: Merge.rc:1166 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1165 +#: Merge.rc:1168 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:1168 +#: Merge.rc:1171 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos" -#: Merge.rc:1170 +#: Merge.rc:1173 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1172 +#: Merge.rc:1175 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos" -#: Merge.rc:1175 +#: Merge.rc:1178 #, c-format msgid "&File Compare method:" msgstr "&M\xE9todo para Comparar Arquivos:" -#: Merge.rc:1178 +#: Merge.rc:1181 #, c-format msgid "S&top after first difference" msgstr "P&arar ap\xF3s a primeira diferen\xE7a" -#: Merge.rc:1181 +#: Merge.rc:1184 #, c-format msgid "Filter Comments" msgstr "Coment\xE1rios do Filtro" -#: Merge.rc:1188 -#: Merge.rc:1944 +#: Merge.rc:1191 +#: Merge.rc:1949 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1191 +#: Merge.rc:1194 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1193 +#: Merge.rc:1196 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento autom\xE1tico" -#: Merge.rc:1195 +#: Merge.rc:1198 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1197 +#: Merge.rc:1200 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1198 +#: Merge.rc:1201 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1201 +#: Merge.rc:1204 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1203 +#: Merge.rc:1206 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espa\xE7os" -#: Merge.rc:1205 +#: Merge.rc:1208 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferen\xE7as das Linhas" -#: Merge.rc:1207 +#: Merge.rc:1210 #, c-format msgid "View line differences" msgstr "Visualizar as diferen\xE7as das linhas" -#: Merge.rc:1209 +#: Merge.rc:1212 #, c-format msgid "&Character level" msgstr "&N\xEDvel dos caracteres" -#: Merge.rc:1211 +#: Merge.rc:1214 #, c-format msgid "&Word-level:" msgstr "&N\xEDvel das palavras:" -#: Merge.rc:1226 +#: Merge.rc:1218 #, c-format +msgid "W&ord break characters:" +msgstr "" + +#: Merge.rc:1231 +#, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1232 +#: Merge.rc:1237 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1233 +#: Merge.rc:1238 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1234 +#: Merge.rc:1239 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1235 +#: Merge.rc:1240 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1236 +#: Merge.rc:1241 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1242 +#: Merge.rc:1247 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1245 +#: Merge.rc:1250 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1248 +#: Merge.rc:1253 #, c-format msgid "&Save changes" msgstr "&Salvar mudan\xE7as" -#: Merge.rc:1250 +#: Merge.rc:1255 #, c-format msgid "&Discard changes" msgstr "&Descartar mudan\xE7as" -#: Merge.rc:1252 +#: Merge.rc:1257 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1255 +#: Merge.rc:1260 #, c-format msgid "S&ave changes" msgstr "S&alvar mudan\xE7as" -#: Merge.rc:1257 +#: Merge.rc:1262 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudan\xE7as" -#: Merge.rc:1259 +#: Merge.rc:1264 #, c-format msgid "Discard All" msgstr "Descartar Tudo" -#: Merge.rc:1266 -#: Merge.rc:1514 -#: Merge.rc:1950 +#: Merge.rc:1271 +#: Merge.rc:1519 +#: Merge.rc:1955 #, c-format msgid "Codepage" msgstr "C\xF3digo da p\xE1gina" -#: Merge.rc:1269 +#: Merge.rc:1274 #, c-format msgid "Default Codepage" msgstr "C\xF3digo da P\xE1gina Padr\xE3o" -#: Merge.rc:1270 +#: Merge.rc:1275 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:" -#: Merge.rc:1272 +#: Merge.rc:1277 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2037,56 +2052,56 @@ "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml \n" "precisa reiniciar a sess\xE3o" -#: Merge.rc:1275 +#: Merge.rc:1280 #, c-format msgid "System codepage" msgstr "C\xF3digo de p\xE1gina do sistema" -#: Merge.rc:1277 +#: Merge.rc:1282 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge" -#: Merge.rc:1279 +#: Merge.rc:1284 #, c-format msgid "Custom codepage:" msgstr "C\xF3digo de p\xE1gina personalizado:" -#: Merge.rc:1287 +#: Merge.rc:1292 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suporte para arquivos desativado" -#: Merge.rc:1290 +#: Merge.rc:1295 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)" -#: Merge.rc:1293 +#: Merge.rc:1298 #, 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 "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada." -#: Merge.rc:1295 +#: Merge.rc:1300 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho." -#: Merge.rc:1297 +#: Merge.rc:1302 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis." -#: Merge.rc:1299 +#: Merge.rc:1304 #, c-format msgid "Version" msgstr "Vers\xE3o" -#: Merge.rc:1301 +#: Merge.rc:1306 #, c-format msgid "" "Plugin required\n" @@ -2095,54 +2110,54 @@ "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1303 +#: Merge.rc:1308 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Vers\xE3o recomendada do 7-Zip:" -#: Merge.rc:1306 -#: Merge.rc:1309 +#: Merge.rc:1311 +#: Merge.rc:1314 #, c-format msgid "present" msgstr "atual" -#: Merge.rc:1307 +#: Merge.rc:1312 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1310 +#: Merge.rc:1315 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado no seu computador:" -#: Merge.rc:1312 #: Merge.rc:1317 +#: Merge.rc:1322 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1314 +#: Merge.rc:1319 #, c-format msgid "missing" msgstr "faltando" -#: Merge.rc:1315 +#: Merge.rc:1320 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:" -#: Merge.rc:1319 +#: Merge.rc:1324 #, c-format msgid "outdated" msgstr "desatualizado" -#: Merge.rc:1320 +#: Merge.rc:1325 #, c-format msgid "Plugins on path:" msgstr "Plugins no caminho:" -#: Merge.rc:1321 +#: Merge.rc:1326 #, c-format msgid "" "Don't display this &message again.\n" @@ -2151,77 +2166,76 @@ "N\xE3o exibir esta mensagem de novo.\n" "(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)" -#: Merge.rc:1325 +#: Merge.rc:1330 #, c-format msgid "Plugin Download" msgstr "Download do Plugin" -#: Merge.rc:1334 +#: Merge.rc:1339 #, c-format msgid "Options" msgstr "Op\xE7\xF5es" -#: Merge.rc:1345 +#: Merge.rc:1350 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1347 +#: Merge.rc:1352 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1348 +#: Merge.rc:1353 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1356 +#: Merge.rc:1361 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1357 +#: Merge.rc:1362 #, c-format msgid "Function names:" msgstr "Nomes das fun\xE7\xF5es:" -#: Merge.rc:1358 +#: Merge.rc:1363 #, c-format msgid "Comments:" msgstr "Coment\xE1rios:" -#: Merge.rc:1359 +#: Merge.rc:1364 #, c-format msgid "Numbers:" msgstr "N\xFAmeros:" -#: Merge.rc:1360 +#: Merge.rc:1365 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1361 +#: Merge.rc:1366 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1362 +#: Merge.rc:1367 #, c-format msgid "Preprocessor:" msgstr "Pr\xE9-processador:" -#: Merge.rc:1363 +#: Merge.rc:1368 #, c-format msgid "User 1:" msgstr "Usu\xE1rio 1:" -#: Merge.rc:1364 +#: Merge.rc:1369 #, c-format msgid "User 2:" msgstr "Usu\xE1rio 2:" -#: Merge.rc:1369 #: Merge.rc:1374 #: Merge.rc:1379 #: Merge.rc:1384 @@ -2230,456 +2244,457 @@ #: Merge.rc:1399 #: Merge.rc:1404 #: Merge.rc:1409 +#: Merge.rc:1414 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1417 +#: Merge.rc:1422 #, c-format msgid "Folder Compare Report" msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas" -#: Merge.rc:1420 +#: Merge.rc:1425 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1423 -#: Merge.rc:1597 -#: Merge.rc:1601 -#: Merge.rc:1628 +#: Merge.rc:1428 +#: Merge.rc:1602 +#: Merge.rc:1606 +#: Merge.rc:1633 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1424 +#: Merge.rc:1429 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1427 +#: Merge.rc:1432 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a \xC1rea de Transfer\xEAncia" -#: Merge.rc:1435 +#: Merge.rc:1440 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1438 +#: Merge.rc:1443 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro voc\xEA quer criar?" -#: Merge.rc:1440 +#: Merge.rc:1445 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)" -#: Merge.rc:1442 +#: Merge.rc:1447 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)" -#: Merge.rc:1450 -#: Merge.rc:1951 +#: Merge.rc:1455 +#: Merge.rc:1956 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1453 +#: Merge.rc:1458 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:" -#: Merge.rc:1455 +#: Merge.rc:1460 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar o Plugin do 7-zip" -#: Merge.rc:1456 +#: Merge.rc:1461 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1458 +#: Merge.rc:1463 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usar 7-zip isolado se dispon\xEDvel" -#: Merge.rc:1461 +#: Merge.rc:1466 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sar 7-Zip local da pasta do WinMerge" -#: Merge.rc:1463 +#: Merge.rc:1468 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1471 +#: Merge.rc:1476 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estat\xEDsticas" -#: Merge.rc:1474 +#: Merge.rc:1479 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1475 +#: Merge.rc:1480 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1476 -#: Merge.rc:2342 +#: Merge.rc:1481 +#: Merge.rc:2347 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1477 +#: Merge.rc:1482 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1480 -#: Merge.rc:1499 +#: Merge.rc:1485 +#: Merge.rc:1504 #, c-format msgid "Binary:" msgstr "Bin\xE1rio:" -#: Merge.rc:1483 +#: Merge.rc:1488 #, c-format msgid "Unique" msgstr "\xDAnico" -#: Merge.rc:1484 +#: Merge.rc:1489 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1489 +#: Merge.rc:1494 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1494 -#: Merge.rc:2336 +#: Merge.rc:1499 +#: Merge.rc:2341 #, c-format msgid "Identical" msgstr "Id\xEAnticos" -#: Merge.rc:1503 +#: Merge.rc:1508 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1508 +#: Merge.rc:1513 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1517 +#: Merge.rc:1522 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1520 -#: Merge.rc:1523 +#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1524 +#: Merge.rc:1529 #, c-format msgid "Select Codepage for" msgstr "Selecionar o C\xF3digo da P\xE1gina para" -#: Merge.rc:1525 +#: Merge.rc:1530 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1527 -#: Merge.rc:1530 +#: Merge.rc:1532 +#: Merge.rc:1535 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1528 +#: Merge.rc:1533 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1531 +#: Merge.rc:1536 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos" -#: Merge.rc:1534 +#: Merge.rc:1539 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1535 -#: Merge.rc:1917 +#: Merge.rc:1540 +#: Merge.rc:1922 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1540 +#: Merge.rc:1545 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1543 +#: Merge.rc:1548 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1545 +#: Merge.rc:1550 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1547 +#: Merge.rc:1552 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1549 +#: Merge.rc:1554 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1553 +#: Merge.rc:1558 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1554 +#: Merge.rc:1559 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1562 +#: Merge.rc:1567 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1565 +#: Merge.rc:1570 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1567 +#: Merge.rc:1572 #, c-format msgid "Whitespace:" msgstr "Espa\xE7o vazio:" -#: Merge.rc:1568 +#: Merge.rc:1573 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1569 +#: Merge.rc:1574 #, c-format msgid "Selection:" msgstr "Sele\xE7\xE3o:" -#: Merge.rc:1592 +#: Merge.rc:1597 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1598 +#: Merge.rc:1603 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1602 +#: Merge.rc:1607 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1608 +#: Merge.rc:1613 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1609 +#: Merge.rc:1614 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1614 -#: Merge.rc:1952 +#: Merge.rc:1619 +#: Merge.rc:1957 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1617 +#: Merge.rc:1622 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1622 +#: Merge.rc:1627 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1623 +#: Merge.rc:1628 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1625 +#: Merge.rc:1630 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1629 +#: Merge.rc:1634 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1630 +#: Merge.rc:1635 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extens\xE3o .bak" -#: Merge.rc:1632 +#: Merge.rc:1637 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1639 -#: Merge.rc:2244 +#: Merge.rc:1644 +#: Merge.rc:2249 #, c-format msgid "Confirm Copy" msgstr "Confirmar a C\xF3pia" -#: Merge.rc:1643 +#: Merge.rc:1648 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?" -#: Merge.rc:1645 +#: Merge.rc:1650 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1648 +#: Merge.rc:1653 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1651 +#: Merge.rc:1656 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1652 +#: Merge.rc:1657 #, c-format msgid "No" msgstr "N\xE3o" -#: Merge.rc:1658 +#: Merge.rc:1663 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1661 +#: Merge.rc:1666 #, c-format msgid "&Enable plugins" msgstr "&Ativar plugins" -#: Merge.rc:1672 -#: Merge.rc:1953 +#: Merge.rc:1677 +#: Merge.rc:1958 #, c-format msgid "Shell Integration" msgstr "Integra\xE7\xE3o com o Shell" -#: Merge.rc:1675 +#: Merge.rc:1680 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1676 +#: Merge.rc:1681 #, c-format msgid "E&nable advanced menu" msgstr "A&tivar o menu avan\xE7ado" -#: Merge.rc:1678 +#: Merge.rc:1683 #, c-format msgid "In&clude subfolders by default" msgstr "In&cluir as sub-pastas por padr\xE3o" -#: Merge.rc:1680 +#: Merge.rc:1685 #, c-format msgid "&Add to context menu" msgstr "&Adicionar ao menu de contexto" -#: Merge.rc:1682 +#: Merge.rc:1687 #, c-format msgid "Folder compare" msgstr "Comparar as pastas" -#: Merge.rc:1683 +#: Merge.rc:1688 #, c-format msgid "Add &Shell menu to context menu" msgstr "Adicionar o &menu do Shell ao menu de contexto" #. StringFileInfo.Block -#: Merge.rc:1709 +#: Merge.rc:1714 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1725 +#: Merge.rc:1730 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1740 +#: Merge.rc:1745 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1746 +#: Merge.rc:1751 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1747 +#: Merge.rc:1752 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1748 +#: Merge.rc:1753 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1749 +#: Merge.rc:1754 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1750 +#: Merge.rc:1755 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1751 +#: Merge.rc:1756 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1757 +#: Merge.rc:1762 #, c-format msgid "" "Create empty documents\n" @@ -2688,7 +2703,7 @@ "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:1758 +#: Merge.rc:1763 #, c-format msgid "" "Open an existing document\n" @@ -2697,7 +2712,7 @@ "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1759 +#: Merge.rc:1764 #, c-format msgid "" "Close the active document\n" @@ -2706,7 +2721,7 @@ "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1760 +#: Merge.rc:1765 #, c-format msgid "" "Save the active document\n" @@ -2715,7 +2730,7 @@ "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:... [truncated message content] |
From: <ki...@us...> - 2009-03-19 18:18:28
|
Revision: 6580 http://winmerge.svn.sourceforge.net/winmerge/?rev=6580&view=rev Author: kimmov Date: 2009-03-19 18:18:18 +0000 (Thu, 19 Mar 2009) Log Message: ----------- Update PO files from current POT file. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/French.po trunk/Src/Languages/Galician.po trunk/Src/Languages/German.po trunk/Src/Languages/Greek.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Japanese.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po trunk/Src/Languages/Ukrainian.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2009-03-19 18:14:08 UTC (rev 6579) +++ trunk/Src/Languages/Brazilian.po 2009-03-19 18:18:18 UTC (rev 6580) @@ -401,7 +401,7 @@ #: Merge.rc:178 #: Merge.rc:299 #: Merge.rc:487 -#: Merge.rc:1939 +#: Merge.rc:1941 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -732,7 +732,7 @@ msgstr "&Scripts" #: Merge.rc:373 -#: Merge.rc:2795 +#: Merge.rc:2797 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -934,15 +934,15 @@ msgstr "&Apagar" #: Merge.rc:526 -#: Merge.rc:1139 -#: Merge.rc:1523 +#: Merge.rc:1141 +#: Merge.rc:1525 #, c-format msgid "&Left" msgstr "&Esquerda" #: Merge.rc:527 -#: Merge.rc:1141 -#: Merge.rc:1526 +#: Merge.rc:1143 +#: Merge.rc:1528 #, c-format msgid "&Right" msgstr "&Direita" @@ -1072,978 +1072,978 @@ msgid "Moved Block for &Current Diff" msgstr "Bloco Movido par&a a Diferen\xE7a Atual" -#: Merge.rc:666 +#: Merge.rc:668 #, c-format msgid "About WinMerge" msgstr "Sobre o WinMerge" -#: Merge.rc:672 +#: Merge.rc:674 #, c-format msgid "(Private Build)" msgstr "(Build Privado)" -#: Merge.rc:673 +#: Merge.rc:675 #, c-format msgid "All rights reserved." msgstr "Todos os direitos reservados." -#: Merge.rc:674 +#: Merge.rc:676 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visitar a Home Page do WinMerge!" -#: Merge.rc:677 -#: Merge.rc:709 -#: Merge.rc:801 -#: Merge.rc:987 -#: Merge.rc:1058 -#: Merge.rc:1087 -#: Merge.rc:1097 -#: Merge.rc:1265 -#: Merge.rc:1329 -#: Merge.rc:1342 -#: Merge.rc:1434 -#: Merge.rc:1449 -#: Merge.rc:1671 +#: Merge.rc:679 +#: Merge.rc:711 +#: Merge.rc:803 +#: Merge.rc:989 +#: Merge.rc:1060 +#: Merge.rc:1089 +#: Merge.rc:1099 +#: Merge.rc:1267 +#: Merge.rc:1331 +#: Merge.rc:1344 +#: Merge.rc:1436 +#: Merge.rc:1451 +#: Merge.rc:1673 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:678 +#: Merge.rc:680 #, c-format msgid "Contributors" msgstr "Contribuidores" -#: Merge.rc:685 +#: Merge.rc:687 #, c-format msgid "Select Files or Folders" msgstr "Selecionar Arquivos ou Pastas" -#: Merge.rc:688 -#: Merge.rc:1600 +#: Merge.rc:690 +#: Merge.rc:1602 #, c-format msgid "&Left:" msgstr "&Esquerda:" -#: Merge.rc:692 -#: Merge.rc:753 -#: Merge.rc:1001 -#: Merge.rc:1023 +#: Merge.rc:694 +#: Merge.rc:755 +#: Merge.rc:1003 +#: Merge.rc:1025 #, c-format msgid "&Browse..." msgstr "&Procurar..." -#: Merge.rc:693 -#: Merge.rc:1604 +#: Merge.rc:695 +#: Merge.rc:1606 #, c-format msgid "&Right:" msgstr "&Direita:" -#: Merge.rc:697 -#: Merge.rc:1034 +#: Merge.rc:699 +#: Merge.rc:1036 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." -#: Merge.rc:698 -#: Merge.rc:1608 +#: Merge.rc:700 +#: Merge.rc:1610 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:701 -#: Merge.rc:1610 +#: Merge.rc:703 +#: Merge.rc:1612 #, c-format msgid "Select..." msgstr "Selecionar..." -#: Merge.rc:702 +#: Merge.rc:704 #, c-format msgid "&Unpacker:" msgstr "&Desempacotador:" -#: Merge.rc:705 +#: Merge.rc:707 #, c-format msgid "&Select..." msgstr "&Selecionar..." -#: Merge.rc:706 -#: Merge.rc:1611 +#: Merge.rc:708 +#: Merge.rc:1613 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" -#: Merge.rc:708 +#: Merge.rc:710 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:710 -#: Merge.rc:740 -#: Merge.rc:802 -#: Merge.rc:832 -#: Merge.rc:864 -#: Merge.rc:874 -#: Merge.rc:1059 -#: Merge.rc:1088 -#: Merge.rc:1098 -#: Merge.rc:1149 -#: Merge.rc:1266 -#: Merge.rc:1343 -#: Merge.rc:1435 -#: Merge.rc:1450 -#: Merge.rc:1672 +#: Merge.rc:712 +#: Merge.rc:742 +#: Merge.rc:804 +#: Merge.rc:834 +#: Merge.rc:866 +#: Merge.rc:876 +#: Merge.rc:1061 +#: Merge.rc:1090 +#: Merge.rc:1100 +#: Merge.rc:1151 +#: Merge.rc:1268 +#: Merge.rc:1345 +#: Merge.rc:1437 +#: Merge.rc:1452 +#: Merge.rc:1674 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:711 -#: Merge.rc:1344 +#: Merge.rc:713 +#: Merge.rc:1346 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:712 +#: Merge.rc:714 #, c-format msgid "Files or Folders to Compare" msgstr "Arquivos ou Pastas para Comparar" -#: Merge.rc:719 +#: Merge.rc:721 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:724 +#: Merge.rc:726 #, c-format msgid "Database:" msgstr "Base de dados:" -#: Merge.rc:727 +#: Merge.rc:729 #, c-format msgid "Project:" msgstr "Projeto:" -#: Merge.rc:730 +#: Merge.rc:732 #, c-format msgid "User:" msgstr "Usu\xE1rio:" -#: Merge.rc:732 +#: Merge.rc:734 #, c-format msgid "Password:" msgstr "Senha:" -#: Merge.rc:734 +#: Merge.rc:736 #, c-format msgid "Link to Destination VSS project" msgstr "Link para o projeto VSS Destino" -#: Merge.rc:736 -#: Merge.rc:879 +#: Merge.rc:738 +#: Merge.rc:881 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" -#: Merge.rc:738 +#: Merge.rc:740 #, c-format msgid "Check Out" msgstr "Veja Isso" -#: Merge.rc:739 -#: Merge.rc:875 +#: Merge.rc:741 +#: Merge.rc:877 #, c-format msgid "Save As..." msgstr "Salvar Como..." -#: Merge.rc:745 +#: Merge.rc:747 #, c-format msgid "Versioning System" msgstr "Sistema de Vers\xF5es" -#: Merge.rc:748 +#: Merge.rc:750 #, c-format msgid "&Versioning System:" msgstr "&Sistema de Vers\xF5es:" -#: Merge.rc:751 -#: Merge.rc:2071 +#: Merge.rc:753 +#: Merge.rc:2073 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" -#: Merge.rc:758 -#: Merge.rc:1947 +#: Merge.rc:760 +#: Merge.rc:1949 #, c-format msgid "General" msgstr "Geral" -#: Merge.rc:761 +#: Merge.rc:763 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automaticame&nte rolar para a primeira diferen\xE7a" -#: Merge.rc:764 +#: Merge.rc:766 #, c-format msgid "&Disable Splash Screen" msgstr "&Desativar a Tela de Inicializa\xE7\xE3o" -#: Merge.rc:766 +#: Merge.rc:768 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fe&char as janelas com o ESC" -#: Merge.rc:768 +#: Merge.rc:770 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Automaticamente verificar os caminhos no di\xE1logo-Abrir" -#: Merge.rc:771 +#: Merge.rc:773 #, c-format msgid "All&ow only one instance to run" msgstr "Per&mitir apenas uma inst\xE2ncia a executar" -#: Merge.rc:773 +#: Merge.rc:775 #, c-format msgid "As&k when closing multiple windows" msgstr "Pe&rguntar quando fechar m\xFAltiplas janelas" -#: Merge.rc:775 +#: Merge.rc:777 #, c-format msgid "&Preserve file time in file compare" msgstr "&Preservar a hora do arquivo na compara\xE7\xE3o dos arquivos" -#: Merge.rc:778 +#: Merge.rc:780 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Mostrar o Di\xE1logo \"Selecionar Arquivos ou Pastas\" ao Iniciar" -#: Merge.rc:780 +#: Merge.rc:782 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-Conclus\xE3o do di\xE1logo-Abrir:" -#: Merge.rc:783 +#: Merge.rc:785 #, c-format msgid "Enable multiple compare windows for" msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para" -#: Merge.rc:785 -#: Merge.rc:1623 +#: Merge.rc:787 +#: Merge.rc:1625 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" -#: Merge.rc:787 -#: Merge.rc:1625 +#: Merge.rc:789 +#: Merge.rc:1627 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" -#: Merge.rc:789 +#: Merge.rc:791 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o bot\xE3o Resetar para tornar todas as caixas de mensagens vis\xEDveis de novo." -#: Merge.rc:791 +#: Merge.rc:793 #, c-format msgid "Reset" msgstr "Resetar" -#: Merge.rc:798 +#: Merge.rc:800 #, c-format msgid "Language" msgstr "Idiomas" -#: Merge.rc:805 +#: Merge.rc:807 #, c-format msgid "Available languages:" msgstr "Idiomas dispon\xEDveis:" -#: Merge.rc:811 +#: Merge.rc:813 #, c-format msgid "Find" msgstr "Achar" -#: Merge.rc:814 -#: Merge.rc:841 +#: Merge.rc:816 +#: Merge.rc:843 #, c-format msgid "Fi&nd what:" msgstr "Ac&har:" -#: Merge.rc:817 -#: Merge.rc:847 +#: Merge.rc:819 +#: Merge.rc:849 #, c-format msgid "Match &whole word only" msgstr "Combinar &apenas palavras inteiras" -#: Merge.rc:819 -#: Merge.rc:849 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "Match &case" msgstr "Combinar &com o caso sensitivo" -#: Merge.rc:821 -#: Merge.rc:851 +#: Merge.rc:823 +#: Merge.rc:853 #, c-format msgid "Regular &expression" msgstr "Express&\xE3o regular" -#: Merge.rc:823 +#: Merge.rc:825 #, c-format msgid "D&on't wrap end of file" msgstr "N&\xE3o organizar o final do arquivo" -#: Merge.rc:826 +#: Merge.rc:828 #, c-format msgid "Direction" msgstr "Dire\xE7\xE3o" -#: Merge.rc:827 +#: Merge.rc:829 #, c-format msgid "&Up" msgstr "&Pra cima" -#: Merge.rc:829 +#: Merge.rc:831 #, c-format msgid "&Down" msgstr "&Pra baixo" -#: Merge.rc:831 -#: Merge.rc:861 +#: Merge.rc:833 +#: Merge.rc:863 #, c-format msgid "&Find Next" msgstr "&Achar o Pr\xF3ximo" -#: Merge.rc:838 +#: Merge.rc:840 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:844 +#: Merge.rc:846 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:853 +#: Merge.rc:855 #, c-format msgid "&Don't wrap end of file" msgstr "&N\xE3o organizar o final do arquivo" -#: Merge.rc:856 +#: Merge.rc:858 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:857 +#: Merge.rc:859 #, c-format msgid "&Selection" msgstr "&Sele\xE7\xE3o" -#: Merge.rc:859 +#: Merge.rc:861 #, c-format msgid "Wh&ole file" msgstr "No &arquivo inteiro" -#: Merge.rc:862 +#: Merge.rc:864 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:863 +#: Merge.rc:865 #, c-format msgid "Replace &All" msgstr "Substituir &Tudo" -#: Merge.rc:870 -#: Merge.rc:2193 +#: Merge.rc:872 +#: Merge.rc:2195 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:873 +#: Merge.rc:875 #, c-format msgid "CheckOut" msgstr "Veja Isso" -#: Merge.rc:878 -#: Merge.rc:1183 +#: Merge.rc:880 +#: Merge.rc:1185 #, c-format msgid "Comments" msgstr "Coment\xE1rios" -#: Merge.rc:881 +#: Merge.rc:883 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ap\xF3s o checkout" -#: Merge.rc:887 +#: Merge.rc:889 #, c-format msgid "Linefilters" msgstr "Filtros das linhas" -#: Merge.rc:890 +#: Merge.rc:892 #, c-format msgid "Enable Line Filters" msgstr "Ativar os Filtros das Linhas" -#: Merge.rc:893 +#: Merge.rc:895 #, c-format msgid "Regular Expressions (one per line):" msgstr "Express\xF5es Regulares (uma por linha):" -#: Merge.rc:900 +#: Merge.rc:902 #, c-format msgid "Save" msgstr "Salvar" -#: Merge.rc:901 +#: Merge.rc:903 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:902 +#: Merge.rc:904 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:903 +#: Merge.rc:905 #, c-format msgid "Remove" msgstr "Remover" -#: Merge.rc:908 -#: Merge.rc:1950 +#: Merge.rc:910 +#: Merge.rc:1952 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:911 +#: Merge.rc:913 #, c-format msgid "Difference:" msgstr "Diferen\xE7a:" -#: Merge.rc:915 +#: Merge.rc:917 #, c-format msgid "Selected Difference:" msgstr "Diferen\xE7a Selecionada:" -#: Merge.rc:919 -#: Merge.rc:1575 +#: Merge.rc:921 +#: Merge.rc:1577 #, c-format msgid "Background" msgstr "2\xBA Plano" -#: Merge.rc:920 +#: Merge.rc:922 #, c-format msgid "Deleted" msgstr "Apagado" -#: Merge.rc:933 -#: Merge.rc:1370 -#: Merge.rc:1576 +#: Merge.rc:935 +#: Merge.rc:1372 +#: Merge.rc:1578 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:937 +#: Merge.rc:939 #, c-format msgid "Ignored Difference:" msgstr "Diferen\xE7a Ignorada:" -#: Merge.rc:947 +#: Merge.rc:949 #, c-format msgid "Moved:" msgstr "Movido:" -#: Merge.rc:957 +#: Merge.rc:959 #, c-format msgid "Selected Moved:" msgstr "Selecionado o Movido:" -#: Merge.rc:964 +#: Merge.rc:966 #, c-format msgid "Word Difference:" msgstr "Diferen\xE7a das Palavras:" -#: Merge.rc:971 +#: Merge.rc:973 #, c-format msgid "Selected Word Diff:" msgstr "Diferen\xE7a das Palavras Selecionadas:" -#: Merge.rc:978 -#: Merge.rc:1057 -#: Merge.rc:1086 -#: Merge.rc:1186 -#: Merge.rc:1416 +#: Merge.rc:980 +#: Merge.rc:1059 +#: Merge.rc:1088 +#: Merge.rc:1188 +#: Merge.rc:1418 #, c-format msgid "Defaults" msgstr "Padr\xF5es" -#: Merge.rc:984 -#: Merge.rc:1358 -#: Merge.rc:1564 +#: Merge.rc:986 +#: Merge.rc:1360 +#: Merge.rc:1566 #, c-format msgid "Dialog" msgstr "Di\xE1logo" -#: Merge.rc:994 -#: Merge.rc:1953 +#: Merge.rc:996 +#: Merge.rc:1955 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:997 +#: Merge.rc:999 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:999 +#: Merge.rc:1001 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:1002 +#: Merge.rc:1004 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:1004 +#: Merge.rc:1006 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:1005 +#: Merge.rc:1007 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos tempor\xE1rios" -#: Merge.rc:1006 +#: Merge.rc:1008 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta tempor\xE1ria do sistema" -#: Merge.rc:1008 +#: Merge.rc:1010 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1011 -#: Merge.rc:1027 +#: Merge.rc:1013 +#: Merge.rc:1029 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:1017 +#: Merge.rc:1019 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1020 +#: Merge.rc:1022 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1024 +#: Merge.rc:1026 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1028 +#: Merge.rc:1030 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1029 +#: Merge.rc:1031 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1031 +#: Merge.rc:1033 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1035 +#: Merge.rc:1037 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1036 +#: Merge.rc:1038 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1039 +#: Merge.rc:1041 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1042 +#: Merge.rc:1044 #, c-format msgid "W&hitespaces" msgstr "E&spa\xE7os em branco" -#: Merge.rc:1043 +#: Merge.rc:1045 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:1045 +#: Merge.rc:1047 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudan\xE7as" -#: Merge.rc:1047 +#: Merge.rc:1049 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:1049 +#: Merge.rc:1051 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1051 +#: Merge.rc:1053 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:1053 +#: Merge.rc:1055 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1055 +#: Merge.rc:1057 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1077 +#: Merge.rc:1079 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1083 +#: Merge.rc:1085 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1084 +#: Merge.rc:1086 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1094 +#: Merge.rc:1096 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1099 +#: Merge.rc:1101 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1102 +#: Merge.rc:1104 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o" -#: Merge.rc:1105 +#: Merge.rc:1107 #, c-format msgid "Extensions list:" msgstr "Lista das extens\xF5es:" -#: Merge.rc:1106 +#: Merge.rc:1108 #, c-format msgid "Description:" msgstr "Descri\xE7\xE3o:" -#: Merge.rc:1117 +#: Merge.rc:1119 #, c-format msgid " Folder Compare Progress" msgstr " Progresso da Compara\xE7\xE3o das Pastas" -#: Merge.rc:1120 -#: Merge.rc:1900 +#: Merge.rc:1122 +#: Merge.rc:1902 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1125 +#: Merge.rc:1127 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1126 +#: Merge.rc:1128 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1127 +#: Merge.rc:1129 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1133 +#: Merge.rc:1135 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1136 +#: Merge.rc:1138 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1138 +#: Merge.rc:1140 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1143 +#: Merge.rc:1145 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1144 +#: Merge.rc:1146 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1146 +#: Merge.rc:1148 #, c-format msgid "&Difference" msgstr "&Diferen\xE7a" -#: Merge.rc:1148 +#: Merge.rc:1150 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1154 -#: Merge.rc:1948 +#: Merge.rc:1156 +#: Merge.rc:1950 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1157 +#: Merge.rc:1159 #, c-format msgid "Whitespace" msgstr "Espa\xE7o em branco" -#: Merge.rc:1158 +#: Merge.rc:1160 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1160 +#: Merge.rc:1162 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudan\xE7a" -#: Merge.rc:1162 +#: Merge.rc:1164 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1164 +#: Merge.rc:1166 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1166 +#: Merge.rc:1168 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1168 +#: Merge.rc:1170 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:1171 +#: Merge.rc:1173 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos" -#: Merge.rc:1173 +#: Merge.rc:1175 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1175 +#: Merge.rc:1177 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos" -#: Merge.rc:1178 +#: Merge.rc:1180 #, c-format msgid "&File Compare method:" msgstr "&M\xE9todo para Comparar Arquivos:" -#: Merge.rc:1181 +#: Merge.rc:1183 #, c-format msgid "S&top after first difference" msgstr "P&arar ap\xF3s a primeira diferen\xE7a" -#: Merge.rc:1184 +#: Merge.rc:1186 #, c-format msgid "Filter Comments" msgstr "Coment\xE1rios do Filtro" -#: Merge.rc:1191 -#: Merge.rc:1949 +#: Merge.rc:1193 +#: Merge.rc:1951 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1194 +#: Merge.rc:1196 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1196 +#: Merge.rc:1198 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento autom\xE1tico" -#: Merge.rc:1198 +#: Merge.rc:1200 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1200 +#: Merge.rc:1202 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1201 +#: Merge.rc:1203 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1204 +#: Merge.rc:1206 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1206 +#: Merge.rc:1208 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espa\xE7os" -#: Merge.rc:1208 +#: Merge.rc:1210 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferen\xE7as das Linhas" -#: Merge.rc:1210 +#: Merge.rc:1212 #, c-format msgid "View line differences" msgstr "Visualizar as diferen\xE7as das linhas" -#: Merge.rc:1212 +#: Merge.rc:1214 #, c-format msgid "&Character level" msgstr "&N\xEDvel dos caracteres" -#: Merge.rc:1214 +#: Merge.rc:1216 #, c-format msgid "&Word-level:" msgstr "&N\xEDvel das palavras:" -#: Merge.rc:1218 +#: Merge.rc:1220 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1231 +#: Merge.rc:1233 #, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1237 +#: Merge.rc:1239 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1238 +#: Merge.rc:1240 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1239 +#: Merge.rc:1241 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1240 +#: Merge.rc:1242 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1241 +#: Merge.rc:1243 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1247 +#: Merge.rc:1249 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1250 +#: Merge.rc:1252 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1253 +#: Merge.rc:1255 #, c-format msgid "&Save changes" msgstr "&Salvar mudan\xE7as" -#: Merge.rc:1255 +#: Merge.rc:1257 #, c-format msgid "&Discard changes" msgstr "&Descartar mudan\xE7as" -#: Merge.rc:1257 +#: Merge.rc:1259 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1260 +#: Merge.rc:1262 #, c-format msgid "S&ave changes" msgstr "S&alvar mudan\xE7as" -#: Merge.rc:1262 +#: Merge.rc:1264 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudan\xE7as" -#: Merge.rc:1264 +#: Merge.rc:1266 #, c-format -msgid "Discard All" -msgstr "Descartar Tudo" +msgid "Disca&rd All" +msgstr "" -#: Merge.rc:1271 -#: Merge.rc:1519 -#: Merge.rc:1955 +#: Merge.rc:1273 +#: Merge.rc:1521 +#: Merge.rc:1957 #, c-format msgid "Codepage" msgstr "C\xF3digo da p\xE1gina" -#: Merge.rc:1274 +#: Merge.rc:1276 #, c-format msgid "Default Codepage" msgstr "C\xF3digo da P\xE1gina Padr\xE3o" -#: Merge.rc:1275 +#: Merge.rc:1277 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:" -#: Merge.rc:1277 +#: Merge.rc:1279 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2052,56 +2052,56 @@ "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml \n" "precisa reiniciar a sess\xE3o" -#: Merge.rc:1280 +#: Merge.rc:1282 #, c-format msgid "System codepage" msgstr "C\xF3digo de p\xE1gina do sistema" -#: Merge.rc:1282 +#: Merge.rc:1284 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge" -#: Merge.rc:1284 +#: Merge.rc:1286 #, c-format msgid "Custom codepage:" msgstr "C\xF3digo de p\xE1gina personalizado:" -#: Merge.rc:1292 +#: Merge.rc:1294 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suporte para arquivos desativado" -#: Merge.rc:1295 +#: Merge.rc:1297 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)" -#: Merge.rc:1298 +#: Merge.rc:1300 #, 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 "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada." -#: Merge.rc:1300 +#: Merge.rc:1302 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho." -#: Merge.rc:1302 +#: Merge.rc:1304 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis." -#: Merge.rc:1304 +#: Merge.rc:1306 #, c-format msgid "Version" msgstr "Vers\xE3o" -#: Merge.rc:1306 +#: Merge.rc:1308 #, c-format msgid "" "Plugin required\n" @@ -2110,54 +2110,54 @@ "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1308 +#: Merge.rc:1310 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Vers\xE3o recomendada do 7-Zip:" -#: Merge.rc:1311 -#: Merge.rc:1314 +#: Merge.rc:1313 +#: Merge.rc:1316 #, c-format msgid "present" msgstr "atual" -#: Merge.rc:1312 +#: Merge.rc:1314 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1315 +#: Merge.rc:1317 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado no seu computador:" -#: Merge.rc:1317 -#: Merge.rc:1322 +#: Merge.rc:1319 +#: Merge.rc:1324 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1319 +#: Merge.rc:1321 #, c-format msgid "missing" msgstr "faltando" -#: Merge.rc:1320 +#: Merge.rc:1322 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:" -#: Merge.rc:1324 +#: Merge.rc:1326 #, c-format msgid "outdated" msgstr "desatualizado" -#: Merge.rc:1325 +#: Merge.rc:1327 #, c-format msgid "Plugins on path:" msgstr "Plugins no caminho:" -#: Merge.rc:1326 +#: Merge.rc:1328 #, c-format msgid "" "Don't display this &message again.\n" @@ -2166,535 +2166,535 @@ "N\xE3o exibir esta mensagem de novo.\n" "(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)" -#: Merge.rc:1330 +#: Merge.rc:1332 #, c-format msgid "Plugin Download" msgstr "Download do Plugin" -#: Merge.rc:1339 +#: Merge.rc:1341 #, c-format msgid "Options" msgstr "Op\xE7\xF5es" -#: Merge.rc:1350 +#: Merge.rc:1352 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1352 +#: Merge.rc:1354 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1353 +#: Merge.rc:1355 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1361 +#: Merge.rc:1363 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1362 +#: Merge.rc:1364 #, c-format msgid "Function names:" msgstr "Nomes das fun\xE7\xF5es:" -#: Merge.rc:1363 +#: Merge.rc:1365 #, c-format msgid "Comments:" msgstr "Coment\xE1rios:" -#: Merge.rc:1364 +#: Merge.rc:1366 #, c-format msgid "Numbers:" msgstr "N\xFAmeros:" -#: Merge.rc:1365 +#: Merge.rc:1367 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1366 +#: Merge.rc:1368 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1367 +#: Merge.rc:1369 #, c-format msgid "Preprocessor:" msgstr "Pr\xE9-processador:" -#: Merge.rc:1368 +#: Merge.rc:1370 #, c-format msgid "User 1:" msgstr "Usu\xE1rio 1:" -#: Merge.rc:1369 +#: Merge.rc:1371 #, c-format msgid "User 2:" msgstr "Usu\xE1rio 2:" -#: Merge.rc:1374 -#: Merge.rc:1379 -#: Merge.rc:1384 -#: Merge.rc:1389 -#: Merge.rc:1394 -#: Merge.rc:1399 -#: Merge.rc:1404 -#: Merge.rc:1409 -#: Merge.rc:1414 +#: Merge.rc:1376 +#: Merge.rc:1381 +#: Merge.rc:1386 +#: Merge.rc:1391 +#: Merge.rc:1396 +#: Merge.rc:1401 +#: Merge.rc:1406 +#: Merge.rc:1411 +#: Merge.rc:1416 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1422 +#: Merge.rc:1424 #, c-format msgid "Folder Compare Report" msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas" -#: Merge.rc:1425 +#: Merge.rc:1427 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1428 -#: Merge.rc:1602 -#: Merge.rc:1606 -#: Merge.rc:1633 +#: Merge.rc:1430 +#: Merge.rc:1604 +#: Merge.rc:1608 +#: Merge.rc:1635 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1429 +#: Merge.rc:1431 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1432 +#: Merge.rc:1434 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a \xC1rea de Transfer\xEAncia" -#: Merge.rc:1440 +#: Merge.rc:1442 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1443 +#: Merge.rc:1445 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro voc\xEA quer criar?" -#: Merge.rc:1445 +#: Merge.rc:1447 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)" -#: Merge.rc:1447 +#: Merge.rc:1449 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)" -#: Merge.rc:1455 -#: Merge.rc:1956 +#: Merge.rc:1457 +#: Merge.rc:1958 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1458 +#: Merge.rc:1460 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:" -#: Merge.rc:1460 +#: Merge.rc:1462 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar o Plugin do 7-zip" -#: Merge.rc:1461 +#: Merge.rc:1463 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1463 +#: Merge.rc:1465 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usar 7-zip isolado se dispon\xEDvel" -#: Merge.rc:1466 +#: Merge.rc:1468 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sar 7-Zip local da pasta do WinMerge" -#: Merge.rc:1468 +#: Merge.rc:1470 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1476 +#: Merge.rc:1478 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estat\xEDsticas" -#: Merge.rc:1479 +#: Merge.rc:1481 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1480 +#: Merge.rc:1482 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1481 -#: Merge.rc:2347 +#: Merge.rc:1483 +#: Merge.rc:2349 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1482 +#: Merge.rc:1484 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1485 -#: Merge.rc:1504 +#: Merge.rc:1487 +#: Merge.rc:1506 #, c-format msgid "Binary:" msgstr "Bin\xE1rio:" -#: Merge.rc:1488 +#: Merge.rc:1490 #, c-format msgid "Unique" msgstr "\xDAnico" -#: Merge.rc:1489 +#: Merge.rc:1491 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1494 +#: Merge.rc:1496 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1499 -#: Merge.rc:2341 +#: Merge.rc:1501 +#: Merge.rc:2343 #, c-format msgid "Identical" msgstr "Id\xEAnticos" -#: Merge.rc:1508 +#: Merge.rc:1510 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1513 +#: Merge.rc:1515 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1522 +#: Merge.rc:1524 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1525 -#: Merge.rc:1528 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1529 +#: Merge.rc:1531 #, c-format msgid "Select Codepage for" msgstr "Selecionar o C\xF3digo da P\xE1gina para" -#: Merge.rc:1530 +#: Merge.rc:1532 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1532 -#: Merge.rc:1535 +#: Merge.rc:1534 +#: Merge.rc:1537 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1533 +#: Merge.rc:1535 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1536 +#: Merge.rc:1538 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos" -#: Merge.rc:1539 +#: Merge.rc:1541 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1540 -#: Merge.rc:1922 +#: Merge.rc:1542 +#: Merge.rc:1924 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1545 +#: Merge.rc:1547 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1548 +#: Merge.rc:1550 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1550 +#: Merge.rc:1552 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1552 +#: Merge.rc:1554 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1554 +#: Merge.rc:1556 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1558 +#: Merge.rc:1560 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1559 +#: Merge.rc:1561 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1567 +#: Merge.rc:1569 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1570 +#: Merge.rc:1572 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1572 +#: Merge.rc:1574 #, c-format msgid "Whitespace:" msgstr "Espa\xE7o vazio:" -#: Merge.rc:1573 +#: Merge.rc:1575 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1574 +#: Merge.rc:1576 #, c-format msgid "Selection:" msgstr "Sele\xE7\xE3o:" -#: Merge.rc:1597 +#: Merge.rc:1599 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1603 +#: Merge.rc:1605 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1607 +#: Merge.rc:1609 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1613 +#: Merge.rc:1615 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1614 +#: Merge.rc:1616 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1619 -#: Merge.rc:1957 +#: Merge.rc:1621 +#: Merge.rc:1959 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1622 +#: Merge.rc:1624 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1627 +#: Merge.rc:1629 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1628 +#: Merge.rc:1630 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1630 +#: Merge.rc:1632 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1634 +#: Merge.rc:1636 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1635 +#: Merge.rc:1637 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extens\xE3o .bak" -#: Merge.rc:1637 +#: Merge.rc:1639 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1644 -#: Merge.rc:2249 +#: Merge.rc:1646 +#: Merge.rc:2251 #, c-format msgid "Confirm Copy" msgstr "Confirmar a C\xF3pia" -#: Merge.rc:1648 +#: Merge.rc:1650 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?" -#: Merge.rc:1650 +#: Merge.rc:1652 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1653 +#: Merge.rc:1655 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1656 +#: Merge.rc:1658 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1657 +#: Merge.rc:1659 #, c-format msgid "No" msgstr "N\xE3o" -#: Merge.rc:1663 +#: Merge.rc:1665 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1666 +#: Merge.rc:1668 #, c-format msgid "&Enable plugins" msgstr "&Ativar plugins" -#: Merge.rc:1677 -#: Merge.rc:1958 +#: Merge.rc:1679 +#: Merge.rc:1960 #, c-format msgid "Shell Integration" msgstr "Integra\xE7\xE3o com o Shell" -#: Merge.rc:1680 +#: Merge.rc:1682 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1681 +#: Merge.rc:1683 #, c-format msgid "E&nable advanced menu" msgstr "A&tivar o menu avan\xE7ado" -#: Merge.rc:1683 +#: Merge.rc:1685 #, c-format msgid "In&clude subfolders by default" msgstr "In&cluir as sub-pastas por padr\xE3o" -#: Merge.rc:1685 +#: Merge.rc:1687 #, c-format msgid "&Add to context menu" msgstr "&Adicionar ao menu de contexto" -#: Merge.rc:1687 +#: Merge.rc:1689 #, c-format msgid "Folder compare" msgstr "Comparar as pastas" -#: Merge.rc:1688 +#: Merge.rc:1690 #, c-format msgid "Add &Shell menu to context menu" msgstr "Adicionar o &menu do Shell ao menu de contexto" #. StringFileInfo.Block -#: Merge.rc:1714 +#: Merge.rc:1716 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1730 +#: Merge.rc:1732 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1745 +#: Merge.rc:1747 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1751 +#: Merge.rc:1753 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1752 +#: Merge.rc:1754 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1753 +#: Merge.rc:1755 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1754 +#: Merge.rc:1756 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1755 +#: Merge.rc:1757 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1756 +#: Merge.rc:1758 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1762 +#: Merge.rc:1764 #, c-format msgid "" "Create empty documents\n" @@ -2703,7 +2703,7 @@ "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:1763 +#: Merge.rc:1765 #, c-format msgid "" "Open an existing document\n" @@ -2712,7 +2712,7 @@ "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1764 +#: Merge.rc:1766 #, c-format msgid "" "Close the active document\n" @@ -2721,7 +2721,7 @@ "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1765 +#: Merge.rc:1767 #, c-format msgid "" "Save the active document\n" @@ -2730,7 +2730,7 @@ "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:1766 +#: Merge.rc:1768 #, c-format msgid "" "Save the active document with a new name\n" @@ -2739,7 +2739,7 @@ "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:1767 +#: Merge.rc:1769 #, c-format msgid "" "Change the printing options\n" @@ -2748,7 +2748,7 @@ "Mudar as op\xE7\xF5es de impress\xE3o\n" "Configurar P\xE1gina" -#: Merge.rc:1768 +#: Merge.rc:1770 #, c-format msgid "" "Change the printer and printing options\n" @@ -2757,7 +2757,7 @@ "Mudar a impressora e as op\xE7\xF5es de impress\xE3o\n" "Configurar a impress\xE3o" -#: Merge.rc:1769 +#: Merge.rc:1771 #, c-format msgid "" "Print the active document\n" @@ -2766,7 +2766,7 @@ "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:1770 +#: Merge.rc:1772 #, c-format msgid "" "Display full pages\n" @@ -2775,27 +2775,27 @@ "Exibir p\xE1ginas completas\n" "Pr\xE9-Visualizar Impress\xE3o" -#: Merge.rc:1775 +#: Merge.rc:1777 #, c-format msgid "Make all hidden items visible again" msgstr "Tornar todos os itens escondidos vis\xEDveis de novo" -#: Merge.rc:1776 +#: Merge.rc:1778 #, c-format msgid "Toggle tree mode" msgstr "Ativar o modo \xE1rvore" -#: Merge.rc:1777 +#: Merge.rc:1779 #, c-format msgid "Expand all subfolders" msgstr "Expandir todas as sub-pastas" -#: Merge.rc:1778 +#: Merge.rc:1780 #, c-format msgid "Collapse all subfolders" msgstr "Retrair todas as sub-pastas" -#: Merge.rc:1784 +#: Merge.rc:1786 #, c-format msgid "" "Open project file\n" @@ -2804,32 +2804,32 @@ "Abrir o arquivo do projeto\n" "Arquivo do projeto (Ctrl+J)" -#: Merge.rc:1785 +#: Merge.rc:1787 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto" -#: Merge.rc:1786 +#: Merge.rc:1788 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto" -#: Merge.rc:1787 +#: Merge.rc:1789 #, c-format msgid "Project File" msgstr "Arquivo do Projeto" -#: Merge.rc:1788 +#: Merge.rc:1790 #, c-format msgid "Project file successfully loaded." msgstr "Arquivo do projeto carregado com sucesso." -#: Merge.rc:1789 +#: Merge.rc:1791 #, c-format msgid "Project file successfully saved." msgstr "Arquivo do projeto salvo com sucesso." -#: Merge.rc:1790 +#: Merge.rc:1792 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2838,7 +2838,7 @@ "Salvar os caminhos atuais e op\xE7\xF5es no arquivo do projeto\n" "Salvar o Arquivo do Projeto" -#: Merge.rc:1795 +#: Merge.rc:1797 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2847,7 +2847,7 @@ "Exibir as informa\xE7\xF5es do programa, n\xFAmero da vers\xE3o e copyright\n" "Sobre" -#: Merge.rc:1796 +#: Merge.rc:1798 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2856,8 +2856,6 @@ "Sair do aplicativo; alertar para salvar os documentos\n" "Sair" -#: Merge.rc:1802 -#: Merge.rc:1803 #: Merge.rc:1804 #: Merge.rc:1805 #: Merge.rc:1806 @@ -2872,11 +2870,13 @@ #: Merge.rc:1815 #: Merge.rc:1816 #: Merge.rc:1817 +#: Merge.rc:1818 +#: Merge.rc:1819 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:1822 +#: Merge.rc:1824 #, c-format msgid "" "Switch to the next window pane\n" @@ -2885,7 +2885,7 @@ "Troca para o pr\xF3ximo painel da janela\n" "Painel Seguinte" -#: Merge.rc:1823 +#: Merge.rc:1825 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2894,7 +2894,7 @@ "Troca de volta para o painel da janela anterior\n" "Painel Anterior" -#: Merge.rc:1829 +#: Merge.rc:1831 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2903,7 +2903,7 @@ "Organiza as janelas para que elas se sobreponham\n" "Janelas em Cascata" -#: Merge.rc:1830 +#: Merge.rc:1832 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2912,7 +2912,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas horizontalmente\n" "Janelas Lado a Lado Horizontalmente" -#: Merge.rc:1831 +#: Merge.rc:1833 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2921,7 +2921,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas verticalmente\n" "Janelas Lado a Lado Verticalmente" -#: Merge.rc:1837 +#: Merge.rc:1839 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2930,7 +2930,7 @@ "Copia a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Copiar" -#: Merge.rc:1838 +#: Merge.rc:1840 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2939,7 +2939,7 @@ "Corta a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Cortar" -#: Merge.rc:1839 +#: Merge.rc:1841 #, c-format msgid "" "Find the specified text\n" @@ -2948,7 +2948,7 @@ "Achar o texto especificado\n" "Achar" -#: Merge.rc:1840 +#: Merge.rc:1842 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2957,7 +2957,7 @@ "Inserir os conte\xFAdos da \xC1rea de Transfer\xEAncia\n" "Colar" -#: Merge.rc:1841 +#: Merge.rc:1843 #, c-format msgid "" "Repeat the last action\n" @@ -2966,7 +2966,7 @@ "Repetir a \xFAltima a\xE7\xE3o\n" "Repetir" -#: Merge.rc:1842 +#: Merge.rc:1844 #, c-format msgid "" "Replace specific text with different text\n" @@ -2975,7 +2975,7 @@ "Substitui o texto espec\xEDfico com um texto diferente\n" "Substituir" -#: Merge.rc:1843 +#: Merge.rc:1845 #, c-format msgid "" "Select the entire document\n" @@ -2984,7 +2984,7 @@ "Seleciona o documento inteiro\n" "Selecionar Tudo" -#: Merge.rc:1844 +#: Merge.rc:1846 #, c-format msgid "" "Undo the last action\n" @@ -2993,7 +2993,7 @@ "Desfazer a \xFAltima a\xE7\xE3o\n" "Desfazer" -#: Merge.rc:1845 +#: Merge.rc:1847 #, c-format msgid "" "Redo the previously undone action\n" @@ -3002,7 +3002,7 @@ "Refazer a a\xE7\xE3o desfeita anteriormente\n" "Refazer" -#: Merge.rc:1851 +#: Merge.rc:1853 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3011,7 +3011,7 @@ "Mostrar ou esconder a barra de ferramentas\n" "Ativar a Barra de Ferramentas" -#: Merge.rc:1852 +#: Merge.rc:1854 #, c-format msgid "" "Show or hide the status bar\n" @@ -3020,7 +3020,7 @@ "Mostrar ou esconder a barra de status\n" "Ativar a Barra de Status" -#: Merge.rc:1853 +#: Merge.rc:1855 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3029,7 +3029,7 @@ "Mostrar ou esconder a barra das abas\n" "Ativar a Barra das Abas" -#: Merge.rc:1854 +#: Merge.rc:1856 #, c-format msgid "" "Automatically resize panes\n" @@ -3038,57 +3038,57 @@ "Automaticamente redimensionar os pain\xE9is\n" "Trancar os Pain\xE9is" -#: Merge.rc:1860 +#: Merge.rc:1862 #, c-format msgid "Change the window size" msgstr "Mudar o tamanho da janela" -#: Merge.rc:1861 +#: Merge.rc:1863 #, c-format msgid "Change the window position" msgstr "Mudar a posi\xE7\xE3o da janela" -#: Merge.rc:1862 +#: Merge.rc:1864 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um \xEDcone" -#: Merge.rc:1863 +#: Merge.rc:1865 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho completo" -#: Merge.rc:1864 +#: Merge.rc:1866 #, c-format msgid "Switch to the next document window" msgstr "Trocar para a pr\xF3xima janela do documento" -#: Merge.rc:1865 +#: Merge.rc:1867 #, c-format msgid "Switch to the previous document window" msgstr "Trocar para a janela do documento anterior" -#: Merge.rc:1866 +#: Merge.rc:1868 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e alerta para salvar os documentos" -#: Merge.rc:1871 +#: Merge.rc:1873 #, c-format msgid "Restore the window to normal size" msgstr "Restaurar a janela para o tamanho normal" -#: Merge.rc:1872 +#: Merge.rc:1874 #, c-format msgid "Activate Task List" msgstr "Ativar a Lista de Tarefas" -#: Merge.rc:1873 +#: Merge.rc:1875 #, c-format msgid "Activate this window" msgstr "Ativar esta janela" -#: Merge.rc:1879 +#: Merge.rc:1881 #, c-format msgid "" "Close print preview mode\n" @@ -3097,7 +3097,7 @@ "Fechar o modo de pr\xE9-visualiza\xE7\xE3o da impress\xE3o\n" "Cancelar a Pr\xE9-Visualiza\xE7\xE3o" -#: Merge.rc:1886 +#: Merge.rc:1888 #, c-format msgid "" "\n" @@ -3116,7 +3116,7 @@ "WinMerge.FileCompare\n" "Compara\xE7\xE3o dos Arquivos do WinMerge" -#: Merge.rc:1887 +#: Merge.rc:1889 #, c-format msgid "" "\n" @@ -3135,23 +3135,23 @@ "WinMerge.FolderCompare\n" "Compara\xE7\xE3o das Pastas do WinMerge" -#: Merge.rc:1894 +#: Merge.rc:1896 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar os caracs. EOL originais" -#: Merge.rc:1901 +#: Merge.rc:1903 #, c-format msgid "Press any key" msgstr "Pressione qualquer tecla" -#: Merge.rc:1907 -#: Merge.rc:1908 +#: Merge.rc:1909 +#: Merge.rc:1910 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o direito no caminho para copiar" -#: Merge.rc:1914 +#: Merge.rc:1916 #, c-format msgid "" "Developers:\n" @@ -3160,157 +3160,157 @@ "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1915 +#: Merge.rc:1917 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este \xE9 um software livre e voc\xEA \xE9 bem vindo para redistribu\xED-lo sob certas circunst\xE2ncias; veja o GNU Licen\xE7a para o P\xFAblico em Geral no menu Ajuda para detalhes." -#: Merge.rc:1921 +#: Merge.rc:1923 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1923 +#: Merge.rc:1925 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:1924 +#: Merge.rc:1926 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:1925 +#: Merge.rc:1927 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:1926 +#: Merge.rc:1928 #, c-format msgid "Ignore &all" msgstr "Ignorar &tudo" -#: Merge.rc:1927 +#: Merge.rc:1929 #, c-format msgid "&Yes" msgstr "&Sim" -#: Merge.rc:1933 +#: Merge.rc:1935 #, c-format msgid "Yes to &all" msgstr "Sim para &todos" -#: Merge.rc:1934 +#: Merge.rc:1936 #, c-format msgid "&No" msgstr "&N\xE3o" -#: Merge.rc:1935 +#: Merge.rc:1937 #, c-format msgid "No to a&ll" msgstr "N\xE3o para t&odos" -#: Merge.rc:1936 +#: Merge.rc:1938 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:1937 +#: Merge.rc:1939 #, c-format msgid "&Skip" msgstr "&Pular" -#: Merge.rc:1938 +#: Merge.rc:1940 #, c-format msgid "Skip &all" msgstr "Pular &tudo" -#: Merge.rc:1940 +#: Merge.rc:1942 #, c-format msgid "Don't display this &message again." msgstr "N\xE3o exibir esta &mensagem de novo." -#: Merge.rc:1941 +#: Merge.rc:1943 #, c-format msgid "Don't ask this &question again." msgstr "N\xE3o perguntar esta &quest\xE3o de novo." -#: Merge.rc:1951 +#: Merge.rc:1953 #, c-format msgid "Syntax colors" msgstr "Cores da sintaxe" -#: Merge.rc:1952 +#: Merge.rc:1954 #, c-format msgid "Text Colors" msgstr "Cores do Texto" -#: Merge.rc:1954 +#: Merge.rc:1956 #, c-format msgid "Version Control" msgstr "Controle da Vers\xE3o" -#: Merge.rc:1965 +#: Merge.rc:1967 #, c-format msgid "To:" msgstr "Para:" -#: Merge.rc:1966 +#: Merge.rc:1968 #, c-format msgid "From left:" msgstr "Da esquerda:" -#: Merge.rc:1967 +#: Merge.rc:1969 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:1968 +#: Merge.rc:1970 #, c-format msgid "From right:" msgstr "Da direita:" -#: Merge.rc:1969 +#: Merge.rc:1971 #, c-format msgid "To right:" msgstr "Para a direita:" -#: Merge.rc:1975 +#: Merge.rc:1977 #, c-format msgid "Version %1" msgstr "Vers\xE3o %1" -#: Merge.rc:1976 +#: Merge.rc:1978 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1977 +#: Merge.rc:1979 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:1983 +#: Merge.rc:1985 #, c-format msgid "Options (%1)" msgstr "Op\xE7\xF5es (%1)" -#: Merge.rc:1984 +#: Merge.rc:1986 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensagens agora ser\xE3o exibidas de novo." -#: Merge.rc:1985 +#: Merge.rc:1987 #, 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 "Modifica\xE7\xF5es foram feitas na sess\xE3o de compara\xE7\xE3o do arquivo atual. Algumas configura\xE7\xF5es podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o do arquivo atual seja reiniciada." -#: Merge.rc:1986 +#: Merge.rc:1988 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A mudan\xE7a da fonte selecionada n\xE3o ser\xE1 aplicada a qualquer das janelas das diferen\xE7as atualmente vis\xEDveis." -#: Merge.rc:1988 +#: Merge.rc:1990 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3321,7 +3321,7 @@ "\n" "Por favor use valores de 1 - %1." -#: Merge.rc:1990 +#: Merge.rc:1992 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3332,129 +3332,129 @@ "\n" "Por favor reinicie o WinMerge ap\xF3s o reset." -#: Merge.rc:1996 +#: Merge.rc:1998 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1997 +#: Merge.rc:1999 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1998 +#: Merge.rc:2000 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1999 +#: Merge.rc:2001 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2001 +#: Merge.rc:2003 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos das op\xE7\xF5es (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2007 +#: Merge.rc:2009 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2008 +#: Merge.rc:2010 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2009 +#: Merge.rc:2011 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2015 +#: Merge.rc:2017 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:2016 +#: Merge.rc:2018 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:2017 +#: Merge.rc:2019 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:2018 +#: Merge.rc:2020 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:2024 +#: Merge.rc:2026 #, c-format msgid "Full Contents" msgstr "Conte\xFAdos Completos" -#: Merge.rc:2025 +#: Merge.rc:2027 #, c-format msgid "Quick Contents" msgstr "Conte\xFAdos R\xE1pidos" -#: Merge.rc:2026 +#: Merge.rc:2028 #, c-format msgid "Modified Date" msgstr "Data Modificada" -#: Merge.rc:2027 +#: Merge.rc:2029 #, c-format msgid "Modified Date and Size" msgstr "Data e Tamanho Modificados" -#: Merge.rc:2028 +#: Merge.rc:2030 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:2034 -#: Merge.rc:2659 +#: Merge.rc:2036 +#: Merge.rc:2661 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2035 +#: Merge.rc:2037 #, c-format msgid "Location" msgstr "Local" -#: Merge.rc:2036 +#: Merge.rc:2038 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2037 +#: Merge.rc:2039 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2038 -#: Merge.rc:2661 +#: Merge.rc:2040 +#: Merge.rc:2663 #, c-format msgid "Description" msgstr "Descri\xE7\xE3o" -#: Merge.rc:2039 +#: Merge.rc:2041 #, c-format msgid "Select filename for new filter" msgstr "Selecionar o nome do arquivo para o novo filtro" -#: Merge.rc:2040 +#: Merge.rc:2042 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2042 +#: Merge.rc:2044 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3467,7 +3467,7 @@ "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:2044 +#: Merge.rc:2046 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3480,7 +3480,7 @@ "\n" "Por favor tenha certeza de que a pasta exista e \xE9 grav\xE1vel." -#: Merge.rc:2046 +#: Merge.rc:2048 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3491,7 +3491,7 @@ "\n" "Por favor selecione a pasta do filtro em Op\xE7\xF5es/Sistema." -#: Merge.rc:2048 +#: Merge.rc:2050 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3504,12 +3504,12 @@ "\n" "Talvez o arquivo seja somente-leitura?" -#: Merge.rc:2049 +#: Merge.rc:2051 #, c-format msgid "Locate filter file to install" msgstr "Localizar o filtro do arquivo para instalar" -#: Merge.rc:2051 +#: Merge.rc:2053 #, c-format msgid "" "Installing filter file failed.\n" @@ -3520,17 +3520,17 @@ "\n" "N\xE3o p\xF4de copiar o novo arquivo do filtro para a pasta do filtro." -#: Merge.rc:2053 +#: Merge.rc:2055 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo do filtro j\xE1 existe. Sobrescrever o filtro existente?" -#: Merge.rc:2059 +#: Merge.rc:2061 #, c-format msgid "Regular expression" msgstr "Express\xE3o regular" -#: Merge.rc:2065 +#: Merge.rc:2067 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3541,203 +3541,203 @@ "\n" "Se voc\xEA n\xE3o quer atualizar todas as compara\xE7\xF5es agora voc\xEA pode selecionar o N\xE3o e atualizar as compara\xE7\xF5es mais tarde." -#: Merge.rc:2072 +#: Merge.rc:2074 #, c-format msgid "&Path to SS.EXE:" msgstr "&Caminho para o SS.EXE:" -#: Merge.rc:2078 +#: Merge.rc:2080 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Compara\xE7\xE3o dos Pastas" -#: Merge.rc:2079 +#: Merge.rc:2081 #, c-format msgid "File Comparison" msgstr "Compara\xE7\xE3o de Arquivo" -#: Merge.rc:2080 +#: Merge.rc:2082 #, c-format msgid "Untitled left" msgstr "Sem t\xEDtulo a esquerda" -#: Merge.rc:2081 +#: Merge.rc:2083 #, c-format msgid "Untitled right" msgstr "Sem t\xEDtulo a direita" -#: Merge.rc:2082 +#: Merge.rc:2084 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2083 +#: Merge.rc:2085 #, c-format msgid "Mine File" msgstr "Meu Arquivo" -#: Merge.rc:2089 +#: Merge.rc:2091 #, c-format msgid "Scanning files..." msgstr "Escaneando arquivos..." -#: Merge.rc:2090 +#: Merge.rc:2092 #, c-format msgid "Opening selection" msgstr "Abrindo a sele\xE7\xE3o" -#: Merge.rc:2091 +#: Merge.rc:2093 #, c-format msgid "Copying Left to Right" msgstr "Copiando da Esquerda para a Direita" -#: Merge.rc:2092 +#: Merge.rc:2094 #, c-format msgid "Copying Right to Left" msgstr "Copiando da Direita para a Esquerda" -#: Merge.rc:2093 +#: Merge.rc:2095 #, c-format msgid "Copying All to Left" msgstr "Copiando Tudo para a Esquerda" -#: Merge.rc:2094 +#: Merge.rc:2096 #, c-format msgid "Copying All to Right" msgstr "Copiando Tudo para a Direita" -#: Merge.rc:2095 +#: Merge.rc:2097 #, c-format msgid "Copying files..." msgstr "Copiando os arquivos..." -#: Merge.rc:2096 +#: Merge.rc:2098 #, c-format msgid "Deleting files..." msgstr "Apagando os arquivos..." -#: Merge.rc:2097 +#: Merge.rc:2099 #, c-format msgid "Moving files..." msgstr "Movendo os arquivos..." -#: Merge.rc:2098 +#: Merge.rc:2100 #, c-format msgid "Creating the report..." msgstr "Criando o relat\xF3rio..." -#: Merge.rc:2099 +#: Merge.rc:2101 #, c-format msgid "Undoing the last operation..." msgstr "Desfazendo a \xFAltima opera\xE7\xE3o..." -#: Merge.rc:2100 +#: Merge.rc:2102 #, c-format msgid "Redoing the previous operation..." msgstr "Refazendo a opera\xE7\xE3o anterior" -#: Merge.rc:2106 +#: Merge.rc:2108 #, 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:2107 +#: Merge.rc:2109 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2108 +#: Merge.rc:2110 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s C... [truncated message content] |
From: <ki...@us...> - 2009-04-16 17:51:09
|
Revision: 6664 http://winmerge.svn.sourceforge.net/winmerge/?rev=6664&view=rev Author: kimmov Date: 2009-04-16 17:50:59 +0000 (Thu, 16 Apr 2009) Log Message: ----------- Update POT and PO translation files for WinMerge 2.13.6 experimental release. Modified Paths: -------------- trunk/Src/Languages/Brazilian.po trunk/Src/Languages/Bulgarian.po trunk/Src/Languages/Catalan.po trunk/Src/Languages/ChineseSimplified.po trunk/Src/Languages/ChineseTraditional.po trunk/Src/Languages/Croatian.po trunk/Src/Languages/Czech.po trunk/Src/Languages/Danish.po trunk/Src/Languages/Dutch.po trunk/Src/Languages/English.pot trunk/Src/Languages/French.po trunk/Src/Languages/Galician.po trunk/Src/Languages/German.po trunk/Src/Languages/Greek.po trunk/Src/Languages/Hungarian.po trunk/Src/Languages/Italian.po trunk/Src/Languages/Japanese.po trunk/Src/Languages/Korean.po trunk/Src/Languages/Norwegian.po trunk/Src/Languages/Polish.po trunk/Src/Languages/Portuguese.po trunk/Src/Languages/Romanian.po trunk/Src/Languages/Russian.po trunk/Src/Languages/Slovak.po trunk/Src/Languages/Slovenian.po trunk/Src/Languages/Spanish.po trunk/Src/Languages/Swedish.po trunk/Src/Languages/Turkish.po trunk/Src/Languages/Ukrainian.po Modified: trunk/Src/Languages/Brazilian.po =================================================================== --- trunk/Src/Languages/Brazilian.po 2009-04-16 17:45:19 UTC (rev 6663) +++ trunk/Src/Languages/Brazilian.po 2009-04-16 17:50:59 UTC (rev 6664) @@ -401,7 +401,7 @@ #: Merge.rc:178 #: Merge.rc:299 #: Merge.rc:487 -#: Merge.rc:1941 +#: Merge.rc:1947 #, c-format msgid "&Help" msgstr "&Ajuda" @@ -732,7 +732,7 @@ msgstr "&Scripts" #: Merge.rc:373 -#: Merge.rc:2797 +#: Merge.rc:2803 #, c-format msgid "< Empty >" msgstr "< Vazio >" @@ -934,15 +934,15 @@ msgstr "&Apagar" #: Merge.rc:526 -#: Merge.rc:1141 -#: Merge.rc:1525 +#: Merge.rc:1147 +#: Merge.rc:1531 #, c-format msgid "&Left" msgstr "&Esquerda" #: Merge.rc:527 -#: Merge.rc:1143 -#: Merge.rc:1528 +#: Merge.rc:1149 +#: Merge.rc:1534 #, c-format msgid "&Right" msgstr "&Direita" @@ -1095,16 +1095,16 @@ #: Merge.rc:679 #: Merge.rc:711 #: Merge.rc:803 -#: Merge.rc:989 -#: Merge.rc:1060 -#: Merge.rc:1089 -#: Merge.rc:1099 -#: Merge.rc:1267 -#: Merge.rc:1331 -#: Merge.rc:1344 -#: Merge.rc:1436 -#: Merge.rc:1451 -#: Merge.rc:1673 +#: Merge.rc:995 +#: Merge.rc:1066 +#: Merge.rc:1095 +#: Merge.rc:1105 +#: Merge.rc:1273 +#: Merge.rc:1337 +#: Merge.rc:1350 +#: Merge.rc:1442 +#: Merge.rc:1457 +#: Merge.rc:1679 #, c-format msgid "OK" msgstr "OK" @@ -1120,39 +1120,39 @@ msgstr "Selecionar Arquivos ou Pastas" #: Merge.rc:690 -#: Merge.rc:1602 +#: Merge.rc:1608 #, c-format msgid "&Left:" msgstr "&Esquerda:" #: Merge.rc:694 #: Merge.rc:755 -#: Merge.rc:1003 -#: Merge.rc:1025 +#: Merge.rc:1009 +#: Merge.rc:1031 #, c-format msgid "&Browse..." msgstr "&Procurar..." #: Merge.rc:695 -#: Merge.rc:1606 +#: Merge.rc:1612 #, c-format msgid "&Right:" msgstr "&Direita:" #: Merge.rc:699 -#: Merge.rc:1036 +#: Merge.rc:1042 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." #: Merge.rc:700 -#: Merge.rc:1610 +#: Merge.rc:1616 #, c-format msgid "&Filter:" msgstr "&Filtro:" #: Merge.rc:703 -#: Merge.rc:1612 +#: Merge.rc:1618 #, c-format msgid "Select..." msgstr "Selecionar..." @@ -1168,7 +1168,7 @@ msgstr "&Selecionar..." #: Merge.rc:708 -#: Merge.rc:1613 +#: Merge.rc:1619 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" @@ -1184,21 +1184,21 @@ #: Merge.rc:834 #: Merge.rc:866 #: Merge.rc:876 -#: Merge.rc:1061 -#: Merge.rc:1090 -#: Merge.rc:1100 -#: Merge.rc:1151 -#: Merge.rc:1268 -#: Merge.rc:1345 -#: Merge.rc:1437 -#: Merge.rc:1452 -#: Merge.rc:1674 +#: Merge.rc:1067 +#: Merge.rc:1096 +#: Merge.rc:1106 +#: Merge.rc:1157 +#: Merge.rc:1274 +#: Merge.rc:1351 +#: Merge.rc:1443 +#: Merge.rc:1458 +#: Merge.rc:1680 #, c-format msgid "Cancel" msgstr "Cancelar" #: Merge.rc:713 -#: Merge.rc:1346 +#: Merge.rc:1352 #, c-format msgid "Help" msgstr "Ajuda" @@ -1266,13 +1266,13 @@ msgstr "&Sistema de Vers\xF5es:" #: Merge.rc:753 -#: Merge.rc:2073 +#: Merge.rc:2079 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" #: Merge.rc:760 -#: Merge.rc:1949 +#: Merge.rc:1955 #, c-format msgid "General" msgstr "Geral" @@ -1328,13 +1328,13 @@ msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para" #: Merge.rc:787 -#: Merge.rc:1625 +#: Merge.rc:1631 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" #: Merge.rc:789 -#: Merge.rc:1627 +#: Merge.rc:1633 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" @@ -1455,7 +1455,7 @@ msgstr "Substituir &Tudo" #: Merge.rc:872 -#: Merge.rc:2195 +#: Merge.rc:2201 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" @@ -1466,7 +1466,7 @@ msgstr "Veja Isso" #: Merge.rc:880 -#: Merge.rc:1185 +#: Merge.rc:1191 #, c-format msgid "Comments" msgstr "Coment\xE1rios" @@ -1512,7 +1512,7 @@ msgstr "Remover" #: Merge.rc:910 -#: Merge.rc:1952 +#: Merge.rc:1958 #, c-format msgid "Colors" msgstr "Cores" @@ -1528,7 +1528,7 @@ msgstr "Diferen\xE7a Selecionada:" #: Merge.rc:921 -#: Merge.rc:1577 +#: Merge.rc:1583 #, c-format msgid "Background" msgstr "2\xBA Plano" @@ -1539,8 +1539,8 @@ msgstr "Apagado" #: Merge.rc:935 -#: Merge.rc:1372 -#: Merge.rc:1578 +#: Merge.rc:1378 +#: Merge.rc:1584 #, c-format msgid "Text" msgstr "Texto" @@ -1565,485 +1565,485 @@ msgid "Word Difference:" msgstr "Diferen\xE7a das Palavras:" -#: Merge.rc:973 +#: Merge.rc:976 #, c-format msgid "Selected Word Diff:" msgstr "Diferen\xE7a das Palavras Selecionadas:" -#: Merge.rc:980 -#: Merge.rc:1059 -#: Merge.rc:1088 -#: Merge.rc:1188 -#: Merge.rc:1418 +#: Merge.rc:986 +#: Merge.rc:1065 +#: Merge.rc:1094 +#: Merge.rc:1194 +#: Merge.rc:1424 #, c-format msgid "Defaults" msgstr "Padr\xF5es" -#: Merge.rc:986 -#: Merge.rc:1360 -#: Merge.rc:1566 +#: Merge.rc:992 +#: Merge.rc:1366 +#: Merge.rc:1572 #, c-format msgid "Dialog" msgstr "Di\xE1logo" -#: Merge.rc:996 -#: Merge.rc:1955 +#: Merge.rc:1002 +#: Merge.rc:1961 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:999 +#: Merge.rc:1005 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:1001 +#: Merge.rc:1007 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:1004 +#: Merge.rc:1010 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:1006 +#: Merge.rc:1012 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:1007 +#: Merge.rc:1013 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos tempor\xE1rios" -#: Merge.rc:1008 +#: Merge.rc:1014 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta tempor\xE1ria do sistema" -#: Merge.rc:1010 +#: Merge.rc:1016 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1013 -#: Merge.rc:1029 +#: Merge.rc:1019 +#: Merge.rc:1035 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:1019 +#: Merge.rc:1025 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1022 +#: Merge.rc:1028 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1026 +#: Merge.rc:1032 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1030 +#: Merge.rc:1036 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1031 +#: Merge.rc:1037 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1033 +#: Merge.rc:1039 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1037 +#: Merge.rc:1043 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1038 +#: Merge.rc:1044 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1041 +#: Merge.rc:1047 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1044 +#: Merge.rc:1050 #, c-format msgid "W&hitespaces" msgstr "E&spa\xE7os em branco" -#: Merge.rc:1045 +#: Merge.rc:1051 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:1047 +#: Merge.rc:1053 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudan\xE7as" -#: Merge.rc:1049 +#: Merge.rc:1055 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:1051 +#: Merge.rc:1057 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1053 +#: Merge.rc:1059 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:1055 +#: Merge.rc:1061 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1057 +#: Merge.rc:1063 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1079 +#: Merge.rc:1085 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1085 +#: Merge.rc:1091 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1086 +#: Merge.rc:1092 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1096 +#: Merge.rc:1102 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1101 +#: Merge.rc:1107 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1104 +#: Merge.rc:1110 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o" -#: Merge.rc:1107 +#: Merge.rc:1113 #, c-format msgid "Extensions list:" msgstr "Lista das extens\xF5es:" -#: Merge.rc:1108 +#: Merge.rc:1114 #, c-format msgid "Description:" msgstr "Descri\xE7\xE3o:" -#: Merge.rc:1119 +#: Merge.rc:1125 #, c-format msgid " Folder Compare Progress" msgstr " Progresso da Compara\xE7\xE3o das Pastas" -#: Merge.rc:1122 -#: Merge.rc:1902 +#: Merge.rc:1128 +#: Merge.rc:1908 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1127 +#: Merge.rc:1133 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1128 +#: Merge.rc:1134 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1129 +#: Merge.rc:1135 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1135 +#: Merge.rc:1141 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1138 +#: Merge.rc:1144 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1140 +#: Merge.rc:1146 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1145 +#: Merge.rc:1151 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1146 +#: Merge.rc:1152 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1148 +#: Merge.rc:1154 #, c-format msgid "&Difference" msgstr "&Diferen\xE7a" -#: Merge.rc:1150 +#: Merge.rc:1156 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1156 -#: Merge.rc:1950 +#: Merge.rc:1162 +#: Merge.rc:1956 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1159 +#: Merge.rc:1165 #, c-format msgid "Whitespace" msgstr "Espa\xE7o em branco" -#: Merge.rc:1160 +#: Merge.rc:1166 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1162 +#: Merge.rc:1168 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudan\xE7a" -#: Merge.rc:1164 +#: Merge.rc:1170 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1166 +#: Merge.rc:1172 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1168 +#: Merge.rc:1174 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1170 +#: Merge.rc:1176 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:1173 +#: Merge.rc:1179 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos" -#: Merge.rc:1175 +#: Merge.rc:1181 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1177 +#: Merge.rc:1183 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos" -#: Merge.rc:1180 +#: Merge.rc:1186 #, c-format msgid "&File Compare method:" msgstr "&M\xE9todo para Comparar Arquivos:" -#: Merge.rc:1183 +#: Merge.rc:1189 #, c-format msgid "S&top after first difference" msgstr "P&arar ap\xF3s a primeira diferen\xE7a" -#: Merge.rc:1186 +#: Merge.rc:1192 #, c-format msgid "Filter Comments" msgstr "Coment\xE1rios do Filtro" -#: Merge.rc:1193 -#: Merge.rc:1951 +#: Merge.rc:1199 +#: Merge.rc:1957 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1196 +#: Merge.rc:1202 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1198 +#: Merge.rc:1204 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento autom\xE1tico" -#: Merge.rc:1200 +#: Merge.rc:1206 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1202 +#: Merge.rc:1208 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1203 +#: Merge.rc:1209 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1206 +#: Merge.rc:1212 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1208 +#: Merge.rc:1214 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espa\xE7os" -#: Merge.rc:1210 +#: Merge.rc:1216 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferen\xE7as das Linhas" -#: Merge.rc:1212 +#: Merge.rc:1218 #, c-format msgid "View line differences" msgstr "Visualizar as diferen\xE7as das linhas" -#: Merge.rc:1214 +#: Merge.rc:1220 #, c-format msgid "&Character level" msgstr "&N\xEDvel dos caracteres" -#: Merge.rc:1216 +#: Merge.rc:1222 #, c-format msgid "&Word-level:" msgstr "&N\xEDvel das palavras:" -#: Merge.rc:1220 +#: Merge.rc:1226 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1233 +#: Merge.rc:1239 #, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1239 +#: Merge.rc:1245 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1240 +#: Merge.rc:1246 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1241 +#: Merge.rc:1247 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1242 +#: Merge.rc:1248 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1243 +#: Merge.rc:1249 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1249 +#: Merge.rc:1255 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1252 +#: Merge.rc:1258 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1255 +#: Merge.rc:1261 #, c-format msgid "&Save changes" msgstr "&Salvar mudan\xE7as" -#: Merge.rc:1257 +#: Merge.rc:1263 #, c-format msgid "&Discard changes" msgstr "&Descartar mudan\xE7as" -#: Merge.rc:1259 +#: Merge.rc:1265 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1262 +#: Merge.rc:1268 #, c-format msgid "S&ave changes" msgstr "S&alvar mudan\xE7as" -#: Merge.rc:1264 +#: Merge.rc:1270 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudan\xE7as" -#: Merge.rc:1266 +#: Merge.rc:1272 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1273 -#: Merge.rc:1521 -#: Merge.rc:1957 +#: Merge.rc:1279 +#: Merge.rc:1527 +#: Merge.rc:1963 #, c-format msgid "Codepage" msgstr "C\xF3digo da p\xE1gina" -#: Merge.rc:1276 +#: Merge.rc:1282 #, c-format msgid "Default Codepage" msgstr "C\xF3digo da P\xE1gina Padr\xE3o" -#: Merge.rc:1277 +#: Merge.rc:1283 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:" -#: Merge.rc:1279 +#: Merge.rc:1285 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2052,56 +2052,56 @@ "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml \n" "precisa reiniciar a sess\xE3o" -#: Merge.rc:1282 +#: Merge.rc:1288 #, c-format msgid "System codepage" msgstr "C\xF3digo de p\xE1gina do sistema" -#: Merge.rc:1284 +#: Merge.rc:1290 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge" -#: Merge.rc:1286 +#: Merge.rc:1292 #, c-format msgid "Custom codepage:" msgstr "C\xF3digo de p\xE1gina personalizado:" -#: Merge.rc:1294 +#: Merge.rc:1300 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suporte para arquivos desativado" -#: Merge.rc:1297 +#: Merge.rc:1303 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)" -#: Merge.rc:1300 +#: Merge.rc:1306 #, 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 "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada." -#: Merge.rc:1302 +#: Merge.rc:1308 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho." -#: Merge.rc:1304 +#: Merge.rc:1310 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis." -#: Merge.rc:1306 +#: Merge.rc:1312 #, c-format msgid "Version" msgstr "Vers\xE3o" -#: Merge.rc:1308 +#: Merge.rc:1314 #, c-format msgid "" "Plugin required\n" @@ -2110,54 +2110,54 @@ "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1310 +#: Merge.rc:1316 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Vers\xE3o recomendada do 7-Zip:" -#: Merge.rc:1313 -#: Merge.rc:1316 +#: Merge.rc:1319 +#: Merge.rc:1322 #, c-format msgid "present" msgstr "atual" -#: Merge.rc:1314 +#: Merge.rc:1320 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1317 +#: Merge.rc:1323 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado no seu computador:" -#: Merge.rc:1319 -#: Merge.rc:1324 +#: Merge.rc:1325 +#: Merge.rc:1330 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1321 +#: Merge.rc:1327 #, c-format msgid "missing" msgstr "faltando" -#: Merge.rc:1322 +#: Merge.rc:1328 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:" -#: Merge.rc:1326 +#: Merge.rc:1332 #, c-format msgid "outdated" msgstr "desatualizado" -#: Merge.rc:1327 +#: Merge.rc:1333 #, c-format msgid "Plugins on path:" msgstr "Plugins no caminho:" -#: Merge.rc:1328 +#: Merge.rc:1334 #, c-format msgid "" "Don't display this &message again.\n" @@ -2166,535 +2166,535 @@ "N\xE3o exibir esta mensagem de novo.\n" "(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)" -#: Merge.rc:1332 +#: Merge.rc:1338 #, c-format msgid "Plugin Download" msgstr "Download do Plugin" -#: Merge.rc:1341 +#: Merge.rc:1347 #, c-format msgid "Options" msgstr "Op\xE7\xF5es" -#: Merge.rc:1352 +#: Merge.rc:1358 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1354 +#: Merge.rc:1360 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1355 +#: Merge.rc:1361 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1363 +#: Merge.rc:1369 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1364 +#: Merge.rc:1370 #, c-format msgid "Function names:" msgstr "Nomes das fun\xE7\xF5es:" -#: Merge.rc:1365 +#: Merge.rc:1371 #, c-format msgid "Comments:" msgstr "Coment\xE1rios:" -#: Merge.rc:1366 +#: Merge.rc:1372 #, c-format msgid "Numbers:" msgstr "N\xFAmeros:" -#: Merge.rc:1367 +#: Merge.rc:1373 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1368 +#: Merge.rc:1374 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1369 +#: Merge.rc:1375 #, c-format msgid "Preprocessor:" msgstr "Pr\xE9-processador:" -#: Merge.rc:1370 +#: Merge.rc:1376 #, c-format msgid "User 1:" msgstr "Usu\xE1rio 1:" -#: Merge.rc:1371 +#: Merge.rc:1377 #, c-format msgid "User 2:" msgstr "Usu\xE1rio 2:" -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 -#: Merge.rc:1406 -#: Merge.rc:1411 -#: Merge.rc:1416 +#: Merge.rc:1382 +#: Merge.rc:1387 +#: Merge.rc:1392 +#: Merge.rc:1397 +#: Merge.rc:1402 +#: Merge.rc:1407 +#: Merge.rc:1412 +#: Merge.rc:1417 +#: Merge.rc:1422 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1424 +#: Merge.rc:1430 #, c-format msgid "Folder Compare Report" msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas" -#: Merge.rc:1427 +#: Merge.rc:1433 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1430 -#: Merge.rc:1604 -#: Merge.rc:1608 -#: Merge.rc:1635 +#: Merge.rc:1436 +#: Merge.rc:1610 +#: Merge.rc:1614 +#: Merge.rc:1641 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1431 +#: Merge.rc:1437 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1434 +#: Merge.rc:1440 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a \xC1rea de Transfer\xEAncia" -#: Merge.rc:1442 +#: Merge.rc:1448 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1445 +#: Merge.rc:1451 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro voc\xEA quer criar?" -#: Merge.rc:1447 +#: Merge.rc:1453 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)" -#: Merge.rc:1449 +#: Merge.rc:1455 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)" -#: Merge.rc:1457 -#: Merge.rc:1958 +#: Merge.rc:1463 +#: Merge.rc:1964 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1460 +#: Merge.rc:1466 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:" -#: Merge.rc:1462 +#: Merge.rc:1468 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar o Plugin do 7-zip" -#: Merge.rc:1463 +#: Merge.rc:1469 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1465 +#: Merge.rc:1471 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usar 7-zip isolado se dispon\xEDvel" -#: Merge.rc:1468 +#: Merge.rc:1474 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sar 7-Zip local da pasta do WinMerge" -#: Merge.rc:1470 +#: Merge.rc:1476 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1478 +#: Merge.rc:1484 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estat\xEDsticas" -#: Merge.rc:1481 +#: Merge.rc:1487 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1482 +#: Merge.rc:1488 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1483 -#: Merge.rc:2349 +#: Merge.rc:1489 +#: Merge.rc:2355 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1484 +#: Merge.rc:1490 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1487 -#: Merge.rc:1506 +#: Merge.rc:1493 +#: Merge.rc:1512 #, c-format msgid "Binary:" msgstr "Bin\xE1rio:" -#: Merge.rc:1490 +#: Merge.rc:1496 #, c-format msgid "Unique" msgstr "\xDAnico" -#: Merge.rc:1491 +#: Merge.rc:1497 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1496 +#: Merge.rc:1502 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1501 -#: Merge.rc:2343 +#: Merge.rc:1507 +#: Merge.rc:2349 #, c-format msgid "Identical" msgstr "Id\xEAnticos" -#: Merge.rc:1510 +#: Merge.rc:1516 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1515 +#: Merge.rc:1521 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1524 +#: Merge.rc:1530 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1527 -#: Merge.rc:1530 +#: Merge.rc:1533 +#: Merge.rc:1536 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1531 +#: Merge.rc:1537 #, c-format msgid "Select Codepage for" msgstr "Selecionar o C\xF3digo da P\xE1gina para" -#: Merge.rc:1532 +#: Merge.rc:1538 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1534 -#: Merge.rc:1537 +#: Merge.rc:1540 +#: Merge.rc:1543 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1535 +#: Merge.rc:1541 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1538 +#: Merge.rc:1544 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos" -#: Merge.rc:1541 +#: Merge.rc:1547 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1542 -#: Merge.rc:1924 +#: Merge.rc:1548 +#: Merge.rc:1930 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1547 +#: Merge.rc:1553 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1550 +#: Merge.rc:1556 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1552 +#: Merge.rc:1558 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1554 +#: Merge.rc:1560 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1556 +#: Merge.rc:1562 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1560 +#: Merge.rc:1566 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1561 +#: Merge.rc:1567 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1569 +#: Merge.rc:1575 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1572 +#: Merge.rc:1578 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1574 +#: Merge.rc:1580 #, c-format msgid "Whitespace:" msgstr "Espa\xE7o vazio:" -#: Merge.rc:1575 +#: Merge.rc:1581 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1576 +#: Merge.rc:1582 #, c-format msgid "Selection:" msgstr "Sele\xE7\xE3o:" -#: Merge.rc:1599 +#: Merge.rc:1605 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1605 +#: Merge.rc:1611 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1609 +#: Merge.rc:1615 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1615 +#: Merge.rc:1621 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1616 +#: Merge.rc:1622 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1621 -#: Merge.rc:1959 +#: Merge.rc:1627 +#: Merge.rc:1965 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1624 +#: Merge.rc:1630 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1629 +#: Merge.rc:1635 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1630 +#: Merge.rc:1636 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1632 +#: Merge.rc:1638 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1636 +#: Merge.rc:1642 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1637 +#: Merge.rc:1643 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extens\xE3o .bak" -#: Merge.rc:1639 +#: Merge.rc:1645 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1646 -#: Merge.rc:2251 +#: Merge.rc:1652 +#: Merge.rc:2257 #, c-format msgid "Confirm Copy" msgstr "Confirmar a C\xF3pia" -#: Merge.rc:1650 +#: Merge.rc:1656 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?" -#: Merge.rc:1652 +#: Merge.rc:1658 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1655 +#: Merge.rc:1661 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1658 +#: Merge.rc:1664 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1659 +#: Merge.rc:1665 #, c-format msgid "No" msgstr "N\xE3o" -#: Merge.rc:1665 +#: Merge.rc:1671 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1668 +#: Merge.rc:1674 #, c-format msgid "&Enable plugins" msgstr "&Ativar plugins" -#: Merge.rc:1679 -#: Merge.rc:1960 +#: Merge.rc:1685 +#: Merge.rc:1966 #, c-format msgid "Shell Integration" msgstr "Integra\xE7\xE3o com o Shell" -#: Merge.rc:1682 +#: Merge.rc:1688 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1683 +#: Merge.rc:1689 #, c-format msgid "E&nable advanced menu" msgstr "A&tivar o menu avan\xE7ado" -#: Merge.rc:1685 +#: Merge.rc:1691 #, c-format msgid "In&clude subfolders by default" msgstr "In&cluir as sub-pastas por padr\xE3o" -#: Merge.rc:1687 +#: Merge.rc:1693 #, c-format msgid "&Add to context menu" msgstr "&Adicionar ao menu de contexto" -#: Merge.rc:1689 +#: Merge.rc:1695 #, c-format msgid "Folder compare" msgstr "Comparar as pastas" -#: Merge.rc:1690 +#: Merge.rc:1696 #, c-format msgid "Add &Shell menu to context menu" msgstr "Adicionar o &menu do Shell ao menu de contexto" #. StringFileInfo.Block -#: Merge.rc:1716 +#: Merge.rc:1722 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1732 +#: Merge.rc:1738 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1747 +#: Merge.rc:1753 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1753 +#: Merge.rc:1759 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1754 +#: Merge.rc:1760 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1755 +#: Merge.rc:1761 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1756 +#: Merge.rc:1762 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1757 +#: Merge.rc:1763 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1758 +#: Merge.rc:1764 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1764 +#: Merge.rc:1770 #, c-format msgid "" "Create empty documents\n" @@ -2703,7 +2703,7 @@ "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:1765 +#: Merge.rc:1771 #, c-format msgid "" "Open an existing document\n" @@ -2712,7 +2712,7 @@ "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1766 +#: Merge.rc:1772 #, c-format msgid "" "Close the active document\n" @@ -2721,7 +2721,7 @@ "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1767 +#: Merge.rc:1773 #, c-format msgid "" "Save the active document\n" @@ -2730,7 +2730,7 @@ "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:1768 +#: Merge.rc:1774 #, c-format msgid "" "Save the active document with a new name\n" @@ -2739,7 +2739,7 @@ "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:1769 +#: Merge.rc:1775 #, c-format msgid "" "Change the printing options\n" @@ -2748,7 +2748,7 @@ "Mudar as op\xE7\xF5es de impress\xE3o\n" "Configurar P\xE1gina" -#: Merge.rc:1770 +#: Merge.rc:1776 #, c-format msgid "" "Change the printer and printing options\n" @@ -2757,7 +2757,7 @@ "Mudar a impressora e as op\xE7\xF5es de impress\xE3o\n" "Configurar a impress\xE3o" -#: Merge.rc:1771 +#: Merge.rc:1777 #, c-format msgid "" "Print the active document\n" @@ -2766,7 +2766,7 @@ "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:1772 +#: Merge.rc:1778 #, c-format msgid "" "Display full pages\n" @@ -2775,27 +2775,27 @@ "Exibir p\xE1ginas completas\n" "Pr\xE9-Visualizar Impress\xE3o" -#: Merge.rc:1777 +#: Merge.rc:1783 #, c-format msgid "Make all hidden items visible again" msgstr "Tornar todos os itens escondidos vis\xEDveis de novo" -#: Merge.rc:1778 +#: Merge.rc:1784 #, c-format msgid "Toggle tree mode" msgstr "Ativar o modo \xE1rvore" -#: Merge.rc:1779 +#: Merge.rc:1785 #, c-format msgid "Expand all subfolders" msgstr "Expandir todas as sub-pastas" -#: Merge.rc:1780 +#: Merge.rc:1786 #, c-format msgid "Collapse all subfolders" msgstr "Retrair todas as sub-pastas" -#: Merge.rc:1786 +#: Merge.rc:1792 #, c-format msgid "" "Open project file\n" @@ -2804,32 +2804,32 @@ "Abrir o arquivo do projeto\n" "Arquivo do projeto (Ctrl+J)" -#: Merge.rc:1787 +#: Merge.rc:1793 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto" -#: Merge.rc:1788 +#: Merge.rc:1794 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto" -#: Merge.rc:1789 +#: Merge.rc:1795 #, c-format msgid "Project File" msgstr "Arquivo do Projeto" -#: Merge.rc:1790 +#: Merge.rc:1796 #, c-format msgid "Project file successfully loaded." msgstr "Arquivo do projeto carregado com sucesso." -#: Merge.rc:1791 +#: Merge.rc:1797 #, c-format msgid "Project file successfully saved." msgstr "Arquivo do projeto salvo com sucesso." -#: Merge.rc:1792 +#: Merge.rc:1798 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2838,7 +2838,7 @@ "Salvar os caminhos atuais e op\xE7\xF5es no arquivo do projeto\n" "Salvar o Arquivo do Projeto" -#: Merge.rc:1797 +#: Merge.rc:1803 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2847,7 +2847,7 @@ "Exibir as informa\xE7\xF5es do programa, n\xFAmero da vers\xE3o e copyright\n" "Sobre" -#: Merge.rc:1798 +#: Merge.rc:1804 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2856,12 +2856,6 @@ "Sair do aplicativo; alertar para salvar os documentos\n" "Sair" -#: Merge.rc:1804 -#: Merge.rc:1805 -#: Merge.rc:1806 -#: Merge.rc:1807 -#: Merge.rc:1808 -#: Merge.rc:1809 #: Merge.rc:1810 #: Merge.rc:1811 #: Merge.rc:1812 @@ -2872,11 +2866,17 @@ #: Merge.rc:1817 #: Merge.rc:1818 #: Merge.rc:1819 +#: Merge.rc:1820 +#: Merge.rc:1821 +#: Merge.rc:1822 +#: Merge.rc:1823 +#: Merge.rc:1824 +#: Merge.rc:1825 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:1824 +#: Merge.rc:1830 #, c-format msgid "" "Switch to the next window pane\n" @@ -2885,7 +2885,7 @@ "Troca para o pr\xF3ximo painel da janela\n" "Painel Seguinte" -#: Merge.rc:1825 +#: Merge.rc:1831 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2894,7 +2894,7 @@ "Troca de volta para o painel da janela anterior\n" "Painel Anterior" -#: Merge.rc:1831 +#: Merge.rc:1837 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2903,7 +2903,7 @@ "Organiza as janelas para que elas se sobreponham\n" "Janelas em Cascata" -#: Merge.rc:1832 +#: Merge.rc:1838 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2912,7 +2912,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas horizontalmente\n" "Janelas Lado a Lado Horizontalmente" -#: Merge.rc:1833 +#: Merge.rc:1839 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2921,7 +2921,7 @@ "Organizar as janelas lado a lado n\xE3o sobrepostas verticalmente\n" "Janelas Lado a Lado Verticalmente" -#: Merge.rc:1839 +#: Merge.rc:1845 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2930,7 +2930,7 @@ "Copia a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Copiar" -#: Merge.rc:1840 +#: Merge.rc:1846 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2939,7 +2939,7 @@ "Corta a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n" "Cortar" -#: Merge.rc:1841 +#: Merge.rc:1847 #, c-format msgid "" "Find the specified text\n" @@ -2948,7 +2948,7 @@ "Achar o texto especificado\n" "Achar" -#: Merge.rc:1842 +#: Merge.rc:1848 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2957,7 +2957,7 @@ "Inserir os conte\xFAdos da \xC1rea de Transfer\xEAncia\n" "Colar" -#: Merge.rc:1843 +#: Merge.rc:1849 #, c-format msgid "" "Repeat the last action\n" @@ -2966,7 +2966,7 @@ "Repetir a \xFAltima a\xE7\xE3o\n" "Repetir" -#: Merge.rc:1844 +#: Merge.rc:1850 #, c-format msgid "" "Replace specific text with different text\n" @@ -2975,7 +2975,7 @@ "Substitui o texto espec\xEDfico com um texto diferente\n" "Substituir" -#: Merge.rc:1845 +#: Merge.rc:1851 #, c-format msgid "" "Select the entire document\n" @@ -2984,7 +2984,7 @@ "Seleciona o documento inteiro\n" "Selecionar Tudo" -#: Merge.rc:1846 +#: Merge.rc:1852 #, c-format msgid "" "Undo the last action\n" @@ -2993,7 +2993,7 @@ "Desfazer a \xFAltima a\xE7\xE3o\n" "Desfazer" -#: Merge.rc:1847 +#: Merge.rc:1853 #, c-format msgid "" "Redo the previously undone action\n" @@ -3002,7 +3002,7 @@ "Refazer a a\xE7\xE3o desfeita anteriormente\n" "Refazer" -#: Merge.rc:1853 +#: Merge.rc:1859 #, c-format msgid "" "Show or hide the toolbar\n" @@ -3011,7 +3011,7 @@ "Mostrar ou esconder a barra de ferramentas\n" "Ativar a Barra de Ferramentas" -#: Merge.rc:1854 +#: Merge.rc:1860 #, c-format msgid "" "Show or hide the status bar\n" @@ -3020,7 +3020,7 @@ "Mostrar ou esconder a barra de status\n" "Ativar a Barra de Status" -#: Merge.rc:1855 +#: Merge.rc:1861 #, c-format msgid "" "Show or hide the tab bar\n" @@ -3029,7 +3029,7 @@ "Mostrar ou esconder a barra das abas\n" "Ativar a Barra das Abas" -#: Merge.rc:1856 +#: Merge.rc:1862 #, c-format msgid "" "Automatically resize panes\n" @@ -3038,57 +3038,57 @@ "Automaticamente redimensionar os pain\xE9is\n" "Trancar os Pain\xE9is" -#: Merge.rc:1862 +#: Merge.rc:1868 #, c-format msgid "Change the window size" msgstr "Mudar o tamanho da janela" -#: Merge.rc:1863 +#: Merge.rc:1869 #, c-format msgid "Change the window position" msgstr "Mudar a posi\xE7\xE3o da janela" -#: Merge.rc:1864 +#: Merge.rc:1870 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um \xEDcone" -#: Merge.rc:1865 +#: Merge.rc:1871 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho completo" -#: Merge.rc:1866 +#: Merge.rc:1872 #, c-format msgid "Switch to the next document window" msgstr "Trocar para a pr\xF3xima janela do documento" -#: Merge.rc:1867 +#: Merge.rc:1873 #, c-format msgid "Switch to the previous document window" msgstr "Trocar para a janela do documento anterior" -#: Merge.rc:1868 +#: Merge.rc:1874 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e alerta para salvar os documentos" -#: Merge.rc:1873 +#: Merge.rc:1879 #, c-format msgid "Restore the window to normal size" msgstr "Restaurar a janela para o tamanho normal" -#: Merge.rc:1874 +#: Merge.rc:1880 #, c-format msgid "Activate Task List" msgstr "Ativar a Lista de Tarefas" -#: Merge.rc:1875 +#: Merge.rc:1881 #, c-format msgid "Activate this window" msgstr "Ativar esta janela" -#: Merge.rc:1881 +#: Merge.rc:1887 #, c-format msgid "" "Close print preview mode\n" @@ -3097,7 +3097,7 @@ "Fechar o modo de pr\xE9-visualiza\xE7\xE3o da impress\xE3o\n" "Cancelar a Pr\xE9-Visualiza\xE7\xE3o" -#: Merge.rc:1888 +#: Merge.rc:1894 #, c-format msgid "" "\n" @@ -3116,7 +3116,7 @@ "WinMerge.FileCompare\n" "Compara\xE7\xE3o dos Arquivos do WinMerge" -#: Merge.rc:1889 +#: Merge.rc:1895 #, c-format msgid "" "\n" @@ -3135,23 +3135,23 @@ "WinMerge.FolderCompare\n" "Compara\xE7\xE3o das Pastas do WinMerge" -#: Merge.rc:1896 +#: Merge.rc:1902 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar os caracs. EOL originais" -#: Merge.rc:1903 +#: Merge.rc:1909 #, c-format msgid "Press any key" msgstr "Pressione qualquer tecla" -#: Merge.rc:1909 -#: Merge.rc:1910 +#: Merge.rc:1915 +#: Merge.rc:1916 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o direito no caminho para copiar" -#: Merge.rc:1916 +#: Merge.rc:1922 #, c-format msgid "" "Developers:\n" @@ -3160,157 +3160,157 @@ "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1917 +#: Merge.rc:1923 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este \xE9 um software livre e voc\xEA \xE9 bem vindo para redistribu\xED-lo sob certas circunst\xE2ncias; veja o GNU Licen\xE7a para o P\xFAblico em Geral no menu Ajuda para detalhes." -#: Merge.rc:1923 +#: Merge.rc:1929 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1925 +#: Merge.rc:1931 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:1926 +#: Merge.rc:1932 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:1927 +#: Merge.rc:1933 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:1928 +#: Merge.rc:1934 #, c-format msgid "Ignore &all" msgstr "Ignorar &tudo" -#: Merge.rc:1929 +#: Merge.rc:1935 #, c-format msgid "&Yes" msgstr "&Sim" -#: Merge.rc:1935 +#: Merge.rc:1941 #, c-format msgid "Yes to &all" msgstr "Sim para &todos" -#: Merge.rc:1936 +#: Merge.rc:1942 #, c-format msgid "&No" msgstr "&N\xE3o" -#: Merge.rc:1937 +#: Merge.rc:1943 #, c-format msgid "No to a&ll" msgstr "N\xE3o para t&odos" -#: Merge.rc:1938 +#: Merge.rc:1944 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:1939 +#: Merge.rc:1945 #, c-format msgid "&Skip" msgstr "&Pular" -#: Merge.rc:1940 +#: Merge.rc:1946 #, c-format msgid "Skip &all" msgstr "Pular &tudo" -#: Merge.rc:1942 +#: Merge.rc:1948 #, c-format msgid "Don't display this &message again." msgstr "N\xE3o exibir esta &mensagem de novo." -#: Merge.rc:1943 +#: Merge.rc:1949 #, c-format msgid "Don't ask this &question again." msgstr "N\xE3o perguntar esta &quest\xE3o de novo." -#: Merge.rc:1953 +#: Merge.rc:1959 #, c-format msgid "Syntax colors" msgstr "Cores da sintaxe" -#: Merge.rc:1954 +#: Merge.rc:1960 #, c-format msgid "Text Colors" msgstr "Cores do Texto" -#: Merge.rc:1956 +#: Merge.rc:1962 #, c-format msgid "Version Control" msgstr "Controle da Vers\xE3o" -#: Merge.rc:1967 +#: Merge.rc:1973 #, c-format msgid "To:" msgstr "Para:" -#: Merge.rc:1968 +#: Merge.rc:1974 #, c-format msgid "From left:" msgstr "Da esquerda:" -#: Merge.rc:1969 +#: Merge.rc:1975 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:1970 +#: Merge.rc:1976 #, c-format msgid "From right:" msgstr "Da direita:" -#: Merge.rc:1971 +#: Merge.rc:1977 #, c-format msgid "To right:" msgstr "Para a direita:" -#: Merge.rc:1977 +#: Merge.rc:1983 #, c-format msgid "Version %1" msgstr "Vers\xE3o %1" -#: Merge.rc:1978 +#: Merge.rc:1984 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1979 +#: Merge.rc:1985 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:1985 +#: Merge.rc:1991 #, c-format msgid "Options (%1)" msgstr "Op\xE7\xF5es (%1)" -#: Merge.rc:1986 +#: Merge.rc:1992 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensagens agora ser\xE3o exibidas de novo." -#: Merge.rc:1987 +#: Merge.rc:1993 #, 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 "Modifica\xE7\xF5es foram feitas na sess\xE3o de compara\xE7\xE3o do arquivo atual. Algumas configura\xE7\xF5es podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o do arquivo atual seja reiniciada." -#: Merge.rc:1988 +#: Merge.rc:1994 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A mudan\xE7a da fonte selecionada n\xE3o ser\xE1 aplicada a qualquer das janelas das diferen\xE7as atualmente vis\xEDveis." -#: Merge.rc:1990 +#: Merge.rc:1996 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3321,7 +3321,7 @@ "\n" "Por favor use valores de 1 - %1." -#: Merge.rc:1992 +#: Merge.rc:1998 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3332,129 +3332,129 @@ "\n" "Por favor reinicie o WinMerge ap\xF3s o reset." -#: Merge.rc:1998 +#: Merge.rc:2004 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1999 +#: Merge.rc:2005 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2000 +#: Merge.rc:2006 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2001 +#: Merge.rc:2007 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2003 +#: Merge.rc:2009 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos das op\xE7\xF5es (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2009 +#: Merge.rc:2015 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2010 +#: Merge.rc:2016 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2011 +#: Merge.rc:2017 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2017 +#: Merge.rc:2023 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:2018 +#: Merge.rc:2024 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:2019 +#: Merge.rc:2025 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:2020 +#: Merge.rc:2026 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:2026 +#: Merge.rc:2032 #, c-format msgid "Full Contents" msgstr "Conte\xFAdos Completos" -#: Merge.rc:2027 +#: Merge.rc:2033 #, c-format msgid "Quick Contents" msgstr "Conte\xFAdos R\xE1pidos" -#: Merge.rc:2028 +#: Merge.rc:2034 #, c-format msgid "Modified Date" msgstr "Data Modificada" -#: Merge.rc:2029 +#: Merge.rc:2035 #, c-format msgid "Modified Date and Size" msgstr "Data e Tamanho Modificados" -#: Merge.rc:2030 +#: Merge.rc:2036 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:2036 -#: Merge.rc:2661 +#: Merge.rc:2042 +#: Merge.rc:2667 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2037 +#: Merge.rc:2043 #, c-format msgid "Location" msgstr "Local" -#: Merge.rc:2038 +#: Merge.rc:2044 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2039 +#: Merge.rc:2045 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2040 -#: Merge.rc:2663 +#: Merge.rc:2046 +#: Merge.rc:2669 #, c-format msgid "Description" msgstr "Descri\xE7\xE3o" -#: Merge.rc:2041 +#: Merge.rc:2047 #, c-format msgid "Select filename for new filter" msgstr "Selecionar o nome do arquivo para o novo filtro" -#: Merge.rc:2042 +#: Merge.rc:2048 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2044 +#: Merge.rc:2050 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3467,7 +3467,7 @@ "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:2046 +#: Merge.rc:2052 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3480,7 +3480,7 @@ "\n" "Por favor tenha certeza de que a pasta exista e \xE9 grav\xE1vel." -#: Merge.rc:2048 +#: Merge.rc:2054 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3491,7 +3491,7 @@ "\n" "Por favor selecione a pasta do filtro em Op\xE7\xF5es/Sistema." -#: Merge.rc:2050 +#: Merge.rc:2056 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3504,12 +3504,12 @@ "\n" "Talvez o arquivo seja somente-leitura?" -#: Merge.rc:2051 +#: Merge.rc:2057 #, c-format msgid "Locate filter file to install" msgstr "Localizar o filtro do arquivo para instalar" -#: Merge.rc:2053 +#: Merge.rc:2059 #, c-format msgid "" "Installing filter file failed.\n" @@ -3520,17 +3520,17 @@ "\n" "N\xE3o p\xF4de copiar o novo arquivo do filtro para a pasta do filtro." -#: Merge.rc:2055 +#: Merge.rc:2061 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo do filtro j\xE1 existe. Sobrescrever o filtro existente?" -#: Merge.rc:2061 +#: Merge.rc:2067 #, c-format msgid "Regular expression" msgstr "Express\xE3o regular" -#: Merge.rc:2067 +#: Merge.rc:2073 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3541,203 +3541,203 @@ "\n" "Se voc\xEA n\xE3o quer atualizar todas as compara\xE7\xF5es agora voc\xEA pode selecionar o N\xE3o e atualizar as compara\xE7\xF5es mais tarde." -#: Merge.rc:2074 +#: Merge.rc:2080 #, c-format msgid "&Path to SS.EXE:" msgstr "&Caminho para o SS.EXE:" -#: Merge.rc:2080 +#: Merge.rc:2086 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Compara\xE7\xE3o dos Pastas" -#: Merge.rc:2081 +#: Merge.rc:2087 #, c-format msgid "File Comparison" msgstr "Compara\xE7\xE3o de Arquivo" -#: Merge.rc:2082 +#: Merge.rc:2088 #, c-format msgid "Untitled left" msgstr "Sem t\xEDtulo a esquerda" -#: Merge.rc:2083 +#: Merge.rc:2089 #, c-format msgid "Untitled right" msgstr "Sem t\xEDtulo a direita" -#: Merge.rc:2084 +#: Merge.rc:2090 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2085 +#: Merge.rc:2091 #, c-format msgid "Mine File" msgstr "Meu Arquivo" -#: Merge.rc:2091 +#: Merge.rc:2097 #, c-format msgid "Scanning files..." msgstr "Escaneando arquivos..." -#: Merge.rc:2092 +#: Merge.rc:2098 #, c-format msgid "Opening selection" msgstr "Abrindo a sele\xE7\xE3o" -#: Merge.rc:2093 +#: Merge.rc:2099 #, c-format msgid "Copying Left to Right" msgstr "Copiando da Esquerda para a Direita" -#: Merge.rc:2094 +#: Merge.rc:2100 #, c-format msgid "Copying Right to Left" msgstr "Copiando da Direita para a Esquerda" -#: Merge.rc:2095 +#: Merge.rc:2101 #, c-format msgid "Copying All to Left" msgstr "Copiando Tudo para a Esquerda" -#: Merge.rc:2096 +#: Merge.rc:2102 #, c-format msgid "Copying All to Right" msgstr "Copiando Tudo para a Direita" -#: Merge.rc:2097 +#: Merge.rc:2103 #, c-format msgid "Copying files..." msgstr "Copiando os arquivos..." -#: Merge.rc:2098 +#: Merge.rc:2104 #, c-format msgid "Deleting files..." msgstr "Apagando os arquivos..." -#: Merge.rc:2099 +#: Merge.rc:2105 #, c-format msgid "Moving files..." msgstr "Movendo os arquivos..." -#: Merge.rc:2100 +#: Merge.rc:2106 #, c-format msgid "Creating the report..." msgstr "Criando o relat\xF3rio..." -#: Merge.rc:2101 +#: Merge.rc:2107 #, c-format msgid "Undoing the last operation..." msgstr "Desfazendo a \xFAltima opera\xE7\xE3o..." -#: Merge.rc:2102 +#: Merge.rc:2108 #, c-format msgid "Redoing the previous operation..." msgstr "Refazendo a opera\xE7\xE3o anterior" -#: Merge.rc:2108 +#: Merge.rc:2114 #, 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:2109 +#: Merge.rc:2115 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2110 +#: Merge.rc:2116 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Ch: %d/%d" -#: Merge.rc:2111 +#: Merge.rc:2117 #, c-format msgid "Merge" msgstr "Unir" -#: Merge.rc:2112 +#: Merge.rc:2118 #, c-format msgid "Difference %1 of %2" msgstr "Diferen\xE7a %1 de %2" -#: Merge.rc:2113 +#: Merge.rc:2119 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferen\xE7as Achadas" -#: Merge.rc:2114 +#: Merge.rc:2120 #, c-format msgid "1 Difference Found" msgstr "1 Diferen\xE7a Achada" #. Abbreviation from "Read Only" -#: Merge.rc:2115 +#: Merge.rc:2121 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2121 +#: Merge.rc:2127 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2122 +#: Merge.rc:2128 #, c-format msgid "Items: %1" msgstr "Itens: %1" -#: Merge.rc:2128 +#: Merge.rc:2134 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione duas pastas ou arquivos existentes para comparar" -#: Merge.rc:2129 +#: Merge.rc:2135 #, c-format msgid "Folder Selection" msgstr "Sele\xE7\xE3o de Pastas" -#: Merge.rc:2130 +#: Merge.rc:2136 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecione duas pastas ou dois arquivos para comparar." -#: Merge.rc:2131 +#: Merge.rc:2137 #, c-format msgid "Left path is invalid!" msgstr "O caminho esquerdo \xE9 inv\xE1lido!" -#: Merge.rc:2132 +#: Merge.rc:2138 #, c-format msgid "Right path is invalid!" msgstr "O caminho direito \xE9 inv\xE1lido!" -#: Merge.rc:2133 +#: Merge.rc:2139 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os caminhos s\xE3o inv\xE1lidos!" -#: Merge.rc:2134 +#: Merge.rc:2140 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolher dois arquivos para ativar a sele\xE7\xE3o do desempacotador." -#: Merge.rc:2135 +#: Merge.rc:2141 #, c-format msgid "Cannot compare file and folder!" msgstr "N\xE3o p\xF4de comparar o arquivo e a pasta!" -#: Merge.rc:2141 +#: Merge.rc:2147 #, c-format msgid "File not found: %1" msgstr "Arquivo n\xE3o achado: %1" -#: Merge.rc:2142 +#: Merge.rc:2148 #, c-format msgid "File not unpacked: %1" msgstr "Arquivo n\xE3o desempacotado: %1" -#: Merge.rc:2143 +#: Merge.rc:2149 #, c-format msgid "" "Cannot open file\n" @@ -3750,12 +3750,12 @@ "\n" "%2" -#: Merge.rc:2144 +#: Merge.rc:2150 #, c-format msgid "Failed to parse conflict file." msgstr "Falhou em analisar o arquivo do conflito." -#: Merge.rc:2145 +#: Merge.rc:2151 #, c-format msgid "" "The file\n" @@ -3766,32 +3766,32 @@ "%1\n" "n\xE3o \xE9 um arquivo de conflito." -#: Merge.rc:2151 +#: Merge.rc:2157 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2152 +#: Merge.rc:2158 #, c-format msgid "Save changes to %1?" msgstr "Salvar as mudan\xE7as em %1?" -#: Merge.rc:2153 +#: Merge.rc:2159 #, 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\xE1 marcado como somente-leitura. Voc\xEA gostaria de sobrescrever o arquivo somente-leitura ? (N\xE3o para salvar com um novo nome de arquivo.)" -#: Merge.rc:2154 +#: Merge.rc:2160 #, c-format msgid "Error checking destination writeability" msgstr "Erro ao verificar a habilidade de gravar no destino" -#: Merge.rc:2155 +#: Merge.rc:2161 #, c-format msgid "Error backing up file" msgstr "Erro ao fazer o backup do arquivo" -#: Merge.rc:2157 +#: Merge.rc:2163 #, c-format msgid "" "Unable to backup original file:\n" @@ -3804,7 +3804,7 @@ "\n" "Continuar de qualquer maneira?" -#: Merge.rc:2158 +#: Merge.rc:2164 #, c-format msgid "" "Saving file failed.\n" @@ -3821,7 +3821,7 @@ "\t-usar um nome de arquivo diferente (Pressione Ok)\n" "\t-abortar a opera\xE7\xE3o atual (Pressione Cancelar)?" -#: Merge.rc:2159 +#: Merge.rc:2165 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3836,7 +3836,7 @@ "\n" "Voc\xEA quer salvar a vers\xE3o desempacotada em outro arquivo?" -#: Merge.rc:2160 +#: Merge.rc:2166 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3851,7 +3851,7 @@ "\n" "Voc\xEA quer salvar a vers\xE3o despachada em outro arquivo?" -#: Merge.rc:2161 +#: Merge.rc:2167 #, c-format msgid "" "Another application has updated file\n" @@ -3866,7 +3866,7 @@ "\n" "Sobrescrever o arquivo mudado?" -#: Merge.rc:2162 +#: Merge.rc:2168 #, c-format msgid "" "%1\n" @@ -3875,7 +3875,7 @@ "%1\n" "est\xE1 marcado como somente-leitura. Voc\xEA gostaria de sobrescrever o item somente-leitura?" -#: Merge.rc:2163 +#: Merge.rc:2169 #, c-format msgid "" "Another application has updated file\n" @@ -3890,17 +3890,17 @@ "\n" "Voc\xEA quer recarregar o arquivo?" -#: Merge.rc:2164 +#: Merge.rc:2170 #, c-format msgid "Save Left File As" msgstr "Salvar o Arquivo a Esquerda Como" -#: Merge.rc:2165 +#: Merge.rc:2171 #, c-format msgid "Save Right File As" msgstr "Salvar o Arquivo a Direita Como" -#: Merge.rc:2166 +#: Merge.rc:2172 #, c-format msgid "" "The file\n" @@ -3911,7 +3911,7 @@ "%1\n" "desapareceu. Por favor salve uma c\xF3pia do arquivo para continuar." -#: Merge.rc:2172 +#: Merge.rc:2178 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3922,42 +3922,42 @@ "\n" "Atualize os documentos antes de continuar." -#: Merge.rc:2178 +#: Merge.rc:2184 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Voc\xEA deve especificar o caminho de um projeto do SourceSafe para continuar (ex: $/MyProject)" -#: Merge.rc:2179 +#: Merge.rc:2185 #, c-format msgid "Checkout files from VSS..." msgstr "Ver os arquivos da VSS..." -#: Merge.rc:2180 +#: Merge.rc:2186 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "O Sistema de Vers\xF5es retornou um erro enquanto tentava verificar o arquivo. Incapaz de continuar..." -#: Merge.rc:2181 +#: Merge.rc:2187 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar o comando do sistema de vers\xF5es." -#: Merge.rc:2182 +#: Merge.rc:2188 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "A Pasta de Trabalho VSS e o local do arquivo atual n\xE3o combinam. Continuar?" -#: Merge.rc:2183 +#: Merge.rc:2189 #, c-format msgid "No VSS database(s) found!" msgstr "N\xE3o foram achadas base(s) de dados VSS!" -#: Merge.rc:2184 +#: Merge.rc:2190 #, c-format msgid "Error from VSS:" msgstr "Erro da VSS:" -#: Merge.rc:2185 +#: Merge.rc:2191 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3968,7 +3968,7 @@ " Por favor, verifique a spec da config da visualiza\xE7\xE3o usada.\n" " Desfazer a opera\xE7\xE3o de verifica\xE7\xE3o?" -#: Merge.rc:2186 +#: Merge.rc:2192 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3977,169 +3977,169 @@ "O Sistema de Vers\xF5es retornou um erro enquanto tentava desfazer o checkout do arquivo.\n" " Por favor, verifique a spec da config da visualiza\xE7\xE3o usada." -#: Merge.rc:2192 -#: Merge.rc:2645 +#: Merge.rc:2198 +#: Merge.rc:2651 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2193 +#: Merge.rc:2199 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor do que 5.0)" -#: Merge.rc:2194 +#: Merge.rc:2200 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e acima)" -#: Merge.rc:2196 +#: Merge.rc:2202 #, c-format msgid "Break ... [truncated message content] |