Commit 68c9553f3752a56cf3a39b4ab0aa081a24a75838
1 parent
8672d124
Exists in
master
and in
5 other branches
Removendo funções sem uso, atualizando tradução
Showing
9 changed files
with
185 additions
and
186 deletions
Show diff stats
po/pt_BR.po
| ... | ... | @@ -5,8 +5,8 @@ msgid "" |
| 5 | 5 | msgstr "" |
| 6 | 6 | "Project-Id-Version: pw3270 5.0\n" |
| 7 | 7 | "Report-Msgid-Bugs-To: \n" |
| 8 | -"POT-Creation-Date: 2013-12-11 15:41-0200\n" | |
| 9 | -"PO-Revision-Date: 2013-12-11 15:45-0200\n" | |
| 8 | +"POT-Creation-Date: 2013-12-12 07:39-0200\n" | |
| 9 | +"PO-Revision-Date: 2013-12-12 07:39-0200\n" | |
| 10 | 10 | "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" |
| 11 | 11 | "Language-Team: Portugues <>\n" |
| 12 | 12 | "Language: pt_BR\n" |
| ... | ... | @@ -19,8 +19,8 @@ msgstr "" |
| 19 | 19 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
| 20 | 20 | "X-Generator: Gtranslator 2.91.6\n" |
| 21 | 21 | |
| 22 | -#: telnet.c:1054 ssl.c:257 ssl.c:310 connect.c:91 connect.c:107 connect.c:109 | |
| 23 | -#: connect.c:600 connect.c:617 | |
| 22 | +#: telnet.c:1050 ssl.c:257 ssl.c:310 connect.c:91 connect.c:107 connect.c:109 | |
| 23 | +#: connect.c:562 connect.c:579 | |
| 24 | 24 | #, c-format |
| 25 | 25 | msgid "%s" |
| 26 | 26 | msgstr "%s" |
| ... | ... | @@ -85,11 +85,6 @@ msgstr "%s: Caractere desconhecido depois de \\pf" |
| 85 | 85 | msgid "%s: Vertical tab not supported" |
| 86 | 86 | msgstr "%s: Tabulação vertical não é suportada" |
| 87 | 87 | |
| 88 | -#: resolver.c:122 | |
| 89 | -#, c-format | |
| 90 | -msgid "%s: unknown family %d" | |
| 91 | -msgstr "%s: Familia %d é inválida" | |
| 92 | - | |
| 93 | 88 | #: main.c:419 |
| 94 | 89 | msgid "- 3270 Emulator for Gtk" |
| 95 | 90 | msgstr "- Emulador 3270 para GTK" |
| ... | ... | @@ -209,7 +204,7 @@ msgstr "Sobre a segurança" |
| 209 | 204 | |
| 210 | 205 | #: ft.c:98 |
| 211 | 206 | msgid "Ack received, data flowing" |
| 212 | -msgstr "Ack received, data flowing" | |
| 207 | +msgstr "Confirmação recebida, transferindo dados" | |
| 213 | 208 | |
| 214 | 209 | #: paste.c:300 |
| 215 | 210 | msgid "Action failed" |
| ... | ... | @@ -267,13 +262,13 @@ msgstr "Avblock" |
| 267 | 262 | |
| 268 | 263 | #: ft.c:99 |
| 269 | 264 | msgid "Awaiting chance to send an abort" |
| 270 | -msgstr "Awaiting chance to send an abort" | |
| 265 | +msgstr "Aguardando para enviar pedido de cancelamento" | |
| 271 | 266 | |
| 272 | 267 | #: colors.c:435 |
| 273 | 268 | msgid "Background" |
| 274 | 269 | msgstr "Fundo" |
| 275 | 270 | |
| 276 | -#: connect.c:173 | |
| 271 | +#: connect.c:168 | |
| 277 | 272 | msgid "Bad winsock version" |
| 278 | 273 | msgstr "Versão winsock inválida" |
| 279 | 274 | |
| ... | ... | @@ -309,7 +304,7 @@ msgstr "Portal do Software Público Brasileiro" |
| 309 | 304 | msgid "Break" |
| 310 | 305 | msgstr "Break" |
| 311 | 306 | |
| 312 | -#: telnet.c:2018 | |
| 307 | +#: telnet.c:2014 | |
| 313 | 308 | msgid "Broken pipe" |
| 314 | 309 | msgstr "Conexão interrompida" |
| 315 | 310 | |
| ... | ... | @@ -343,26 +338,26 @@ msgstr "C_odificação de caracteres:" |
| 343 | 338 | msgid "C_olor scheme:" |
| 344 | 339 | msgstr "Tema de c_ores:" |
| 345 | 340 | |
| 346 | -#: v3270/hostselect.c:389 | |
| 341 | +#: v3270/hostselect.c:390 | |
| 347 | 342 | msgid "C_onnect" |
| 348 | 343 | msgstr "_Conectar" |
| 349 | 344 | |
| 350 | -#: toggles.c:177 connect.c:387 connect.c:482 | |
| 345 | +#: toggles.c:177 connect.c:354 connect.c:449 | |
| 351 | 346 | #, c-format |
| 352 | 347 | msgid "Can't %s network keep-alive" |
| 353 | -msgstr "Can't %s network keep-alive" | |
| 348 | +msgstr "Não foi possível %s opção \"keep-alive\"" | |
| 354 | 349 | |
| 355 | 350 | #: uiparser/parsefile.c:225 |
| 356 | 351 | #, c-format |
| 357 | 352 | msgid "Can't accept unnamed %s" |
| 358 | 353 | msgstr "Não posso aceitar elemento %s sem nome" |
| 359 | 354 | |
| 360 | -#: connect.c:99 connect.c:418 | |
| 355 | +#: connect.c:99 connect.c:385 | |
| 361 | 356 | #, c-format |
| 362 | 357 | msgid "Can't connect to %s" |
| 363 | 358 | msgstr "Não foi possível conectar a %s" |
| 364 | 359 | |
| 365 | -#: connect.c:271 connect.c:452 | |
| 360 | +#: connect.c:266 connect.c:419 | |
| 366 | 361 | #, c-format |
| 367 | 362 | msgid "Can't connect to %s:%s" |
| 368 | 363 | msgstr "Não foi possível conectar a %s:%s" |
| ... | ... | @@ -376,7 +371,7 @@ msgstr "Não foi possível converter a linha %d de %s para %s" |
| 376 | 371 | msgid "Can't cut rectangular regions" |
| 377 | 372 | msgstr "Recortar não permitido em seleção retangular" |
| 378 | 373 | |
| 379 | -#: connect.c:199 | |
| 374 | +#: connect.c:194 | |
| 380 | 375 | #, c-format |
| 381 | 376 | msgid "Can't determine value for environment variable \"%s\" " |
| 382 | 377 | msgstr "Can't determine value for environment variable \"%s\" " |
| ... | ... | @@ -460,15 +455,15 @@ msgstr "Não foi possível salvar trace no arquivo %s" |
| 460 | 455 | msgid "Can't set host charset" |
| 461 | 456 | msgstr "Não foi possível definir o charset do host" |
| 462 | 457 | |
| 463 | -#: v3270/iocallback.c:359 | |
| 458 | +#: v3270/iocallback.c:353 | |
| 464 | 459 | msgid "Can't set lib3270 I/O handlers" |
| 465 | 460 | msgstr "Não foi possível registrar manipuladores de I/O 3270" |
| 466 | 461 | |
| 467 | -#: connect.c:616 | |
| 462 | +#: connect.c:578 | |
| 468 | 463 | msgid "Can't set socket to blocking mode." |
| 469 | 464 | msgstr "Não foi possível mudar o socket para o modo blocante." |
| 470 | 465 | |
| 471 | -#: connect.c:616 | |
| 466 | +#: connect.c:578 | |
| 472 | 467 | msgid "Can't set socket to non blocking mode" |
| 473 | 468 | msgstr "Não foi possível setar o socket para o modo não blocante." |
| 474 | 469 | |
| ... | ... | @@ -484,16 +479,16 @@ msgstr "Não foi possível iniciar transferência de arquivo." |
| 484 | 479 | msgid "Can't start upload." |
| 485 | 480 | msgstr "Não foi possível iniciar upload." |
| 486 | 481 | |
| 487 | -#: connect.c:174 | |
| 482 | +#: connect.c:169 | |
| 488 | 483 | #, c-format |
| 489 | 484 | msgid "Can't use winsock version %d.%d" |
| 490 | 485 | msgstr "Não é possível usar a Winsock versão %d.%d" |
| 491 | 486 | |
| 492 | -#: ft/ftdialog.c:408 | |
| 487 | +#: ft/ftdialog.c:399 | |
| 493 | 488 | msgid "Cancel download." |
| 494 | 489 | msgstr "Cancelar recebimento." |
| 495 | 490 | |
| 496 | -#: ft/ftdialog.c:408 | |
| 491 | +#: ft/ftdialog.c:399 | |
| 497 | 492 | msgid "Cancel upload." |
| 498 | 493 | msgstr "Cancelar envio." |
| 499 | 494 | |
| ... | ... | @@ -501,10 +496,6 @@ msgstr "Cancelar envio." |
| 501 | 496 | msgid "Cancelled by user" |
| 502 | 497 | msgstr "Cancelado pelo usuário" |
| 503 | 498 | |
| 504 | -#: connect.c:363 | |
| 505 | -msgid "Cannot create socket event" | |
| 506 | -msgstr "Não foi possível criar um semáforo para comunicação" | |
| 507 | - | |
| 508 | 499 | #: ssl.c:309 |
| 509 | 500 | msgid "Cant create a new SSL structure for current connection." |
| 510 | 501 | msgstr "Cant create a new SSL structure for current connection." |
| ... | ... | @@ -523,8 +514,8 @@ msgid "" |
| 523 | 514 | "Cant set the file descriptor for the input/output facility for the TLS/SSL " |
| 524 | 515 | "(encrypted) side of ssl." |
| 525 | 516 | msgstr "" |
| 526 | -"Cant set the file descriptor for the input/output facility for the TLS/SSL " | |
| 527 | -"(encrypted) side of ssl." | |
| 517 | +"Não foi possível definir o descritor de arquivo para a conexão TLS/SSL " | |
| 518 | +"(encriptada)." | |
| 528 | 519 | |
| 529 | 520 | #: v3270/security.c:110 |
| 530 | 521 | msgid "Certificate has expired" |
| ... | ... | @@ -582,13 +573,17 @@ msgstr "Cores" |
| 582 | 573 | msgid "Command:" |
| 583 | 574 | msgstr "Command:" |
| 584 | 575 | |
| 576 | +#: v3270/hostselect.c:386 ui/00default.xml:282 | |
| 577 | +msgid "Configure host" | |
| 578 | +msgstr "Configurar host" | |
| 579 | + | |
| 585 | 580 | #: ui/00default.xml:307 |
| 586 | 581 | msgid "Connect on startup" |
| 587 | 582 | msgstr "Conectar ao iniciar" |
| 588 | 583 | |
| 589 | -#: connect.c:197 connect.c:292 connect.c:301 connect.c:391 connect.c:406 | |
| 590 | -#: connect.c:422 connect.c:436 connect.c:456 connect.c:470 connect.c:486 | |
| 591 | -#: connect.c:585 | |
| 584 | +#: connect.c:192 connect.c:287 connect.c:296 connect.c:358 connect.c:373 | |
| 585 | +#: connect.c:389 connect.c:403 connect.c:423 connect.c:437 connect.c:453 | |
| 586 | +#: connect.c:547 | |
| 592 | 587 | msgid "Connection error" |
| 593 | 588 | msgstr "Erro de conexão" |
| 594 | 589 | |
| ... | ... | @@ -596,7 +591,7 @@ msgstr "Erro de conexão" |
| 596 | 591 | msgid "Connection failed" |
| 597 | 592 | msgstr "Conexão falhou" |
| 598 | 593 | |
| 599 | -#: telnet.c:2022 | |
| 594 | +#: telnet.c:2018 | |
| 600 | 595 | msgid "Connection reset by peer" |
| 601 | 596 | msgstr "Conexão foi cancelada pelo servidor" |
| 602 | 597 | |
| ... | ... | @@ -686,7 +681,7 @@ msgstr "Padrão" |
| 686 | 681 | msgid "Delete field" |
| 687 | 682 | msgstr "Apagar campo" |
| 688 | 683 | |
| 689 | -#: telnet.c:1693 | |
| 684 | +#: telnet.c:1689 | |
| 690 | 685 | msgid "Device type rejected" |
| 691 | 686 | msgstr "Tipo de dispositivo rejeitado" |
| 692 | 687 | |
| ... | ... | @@ -698,7 +693,7 @@ msgstr "Desconectado do servidor." |
| 698 | 693 | msgid "Display current charset" |
| 699 | 694 | msgstr "Mostrar a tabela de caracteres ativa" |
| 700 | 695 | |
| 701 | -#: telnet.c:1245 | |
| 696 | +#: telnet.c:1241 | |
| 702 | 697 | msgid "EOR received when not in 3270 mode, ignored." |
| 703 | 698 | msgstr "EOR recebido fora do modo 3270, ignorado." |
| 704 | 699 | |
| ... | ... | @@ -748,21 +743,11 @@ msgstr "Erro \"%s\" lendo arquivo local (rc=%d)" |
| 748 | 743 | msgid "Error \"%s\" writing to local file (rc=%d)" |
| 749 | 744 | msgstr "Erro \"%s\" gravando arquivo local (rc=%d)" |
| 750 | 745 | |
| 751 | -#: resolver.c:106 | |
| 752 | -#, c-format | |
| 753 | -msgid "Error %d resolving %s" | |
| 754 | -msgstr "Erro %d resolvendo %s" | |
| 755 | - | |
| 756 | 746 | #: dialog.c:377 |
| 757 | 747 | #, c-format |
| 758 | 748 | msgid "Error loading %s" |
| 759 | 749 | msgstr "Erro lendo %s" |
| 760 | 750 | |
| 761 | -#: resolver.c:108 | |
| 762 | -#, c-format | |
| 763 | -msgid "Error resolving %s: %s" | |
| 764 | -msgstr "Erro ao resolver %s: %s" | |
| 765 | - | |
| 766 | 751 | #: ui/98trace.xml:494 |
| 767 | 752 | msgid "Event Trace" |
| 768 | 753 | msgstr "Trace de eventos" |
| ... | ... | @@ -843,15 +828,15 @@ msgstr "Ajuda" |
| 843 | 828 | msgid "Host disconnected, transfer cancelled" |
| 844 | 829 | msgstr "Servidor desconectou, transferência cancelada" |
| 845 | 830 | |
| 846 | -#: telnet.c:1751 | |
| 831 | +#: telnet.c:1747 | |
| 847 | 832 | msgid "Host illegally added function(s)" |
| 848 | 833 | msgstr "Host illegally added function(s)" |
| 849 | 834 | |
| 850 | -#: telnet.c:1676 | |
| 835 | +#: telnet.c:1672 | |
| 851 | 836 | msgid "Host rejected device type or request type" |
| 852 | 837 | msgstr "Servidor rejeitou o tipo de dispositivo ou requisição" |
| 853 | 838 | |
| 854 | -#: telnet.c:1689 | |
| 839 | +#: telnet.c:1685 | |
| 855 | 840 | msgid "Host rejected resource(s)" |
| 856 | 841 | msgstr "Servidor rejeitou recurso(s)" |
| 857 | 842 | |
| ... | ... | @@ -964,7 +949,7 @@ msgstr "Nome do arquivo destino." |
| 964 | 949 | msgid "Network Trace" |
| 965 | 950 | msgstr "Trace do tráfego de rede" |
| 966 | 951 | |
| 967 | -#: telnet.c:344 iocalls.c:428 iocalls.c:520 connect.c:86 | |
| 952 | +#: telnet.c:344 iocalls.c:408 iocalls.c:551 connect.c:86 | |
| 968 | 953 | msgid "Network error" |
| 969 | 954 | msgstr "Erro de rede" |
| 970 | 955 | |
| ... | ... | @@ -972,7 +957,7 @@ msgstr "Erro de rede" |
| 972 | 957 | msgid "Network keep alive" |
| 973 | 958 | msgstr "Network keep alive" |
| 974 | 959 | |
| 975 | -#: connect.c:161 connect.c:172 connect.c:362 connect.c:373 | |
| 960 | +#: connect.c:156 connect.c:167 | |
| 976 | 961 | msgid "Network startup error" |
| 977 | 962 | msgstr "Erro ao iniciar a rede" |
| 978 | 963 | |
| ... | ... | @@ -1207,7 +1192,7 @@ msgstr "Rosa" |
| 1207 | 1192 | |
| 1208 | 1193 | #: v3270/hostselect.c:163 |
| 1209 | 1194 | msgid "Port or service name (empty for \"telnet\")." |
| 1210 | -msgstr "Port or service name (empty for \"telnet\")." | |
| 1195 | +msgstr "Nº da porta ou nome do serviço (em branco para \"telnet\")." | |
| 1211 | 1196 | |
| 1212 | 1197 | #: ui/00default.xml:379 |
| 1213 | 1198 | msgid "Previous field" |
| ... | ... | @@ -1410,15 +1395,15 @@ msgstr "Return" |
| 1410 | 1395 | msgid "SSL Connect failed" |
| 1411 | 1396 | msgstr "Conexão SSL falhou" |
| 1412 | 1397 | |
| 1413 | -#: telnet.c:1037 | |
| 1398 | +#: telnet.c:1033 | |
| 1414 | 1399 | msgid "SSL Error" |
| 1415 | 1400 | msgstr "Erro SSL" |
| 1416 | 1401 | |
| 1417 | -#: telnet.c:1037 | |
| 1402 | +#: telnet.c:1033 | |
| 1418 | 1403 | msgid "SSL Read error" |
| 1419 | 1404 | msgstr "Erro de leitura SSL" |
| 1420 | 1405 | |
| 1421 | -#: connect.c:329 | |
| 1406 | +#: connect.c:324 | |
| 1422 | 1407 | msgid "SSL error" |
| 1423 | 1408 | msgstr "Erro SSL" |
| 1424 | 1409 | |
| ... | ... | @@ -1430,7 +1415,7 @@ msgstr "Negociação SSL falhou" |
| 1430 | 1415 | msgid "SSL_CTX_new() has failed" |
| 1431 | 1416 | msgstr "SSL_CTX_new() has failed" |
| 1432 | 1417 | |
| 1433 | -#: telnet.c:2008 | |
| 1418 | +#: telnet.c:2004 | |
| 1434 | 1419 | #, c-format |
| 1435 | 1420 | msgid "" |
| 1436 | 1421 | "SSL_write:\n" |
| ... | ... | @@ -1527,11 +1512,7 @@ msgstr "Selecione arquivo a enviar" |
| 1527 | 1512 | msgid "Select font" |
| 1528 | 1513 | msgstr "Selecione fonte" |
| 1529 | 1514 | |
| 1530 | -#: v3270/hostselect.c:386 | |
| 1531 | -msgid "Select hostname" | |
| 1532 | -msgstr "Selecione host" | |
| 1533 | - | |
| 1534 | -#: iocalls.c:521 | |
| 1515 | +#: iocalls.c:409 iocalls.c:552 | |
| 1535 | 1516 | msgid "Select() failed when processing for events." |
| 1536 | 1517 | msgstr "Select() falhou ao processar eventos." |
| 1537 | 1518 | |
| ... | ... | @@ -1579,10 +1560,6 @@ msgstr "Nome da sessão" |
| 1579 | 1560 | msgid "Set host charset" |
| 1580 | 1561 | msgstr "Define página de código do host" |
| 1581 | 1562 | |
| 1582 | -#: ui/00default.xml:282 | |
| 1583 | -msgid "Set hostname" | |
| 1584 | -msgstr "Selecione servidor" | |
| 1585 | - | |
| 1586 | 1563 | #: main.c:404 |
| 1587 | 1564 | msgid "Set reported colors (8/16)" |
| 1588 | 1565 | msgstr "Define número de cores informadas (8/16)" |
| ... | ... | @@ -1615,15 +1592,15 @@ msgstr "Mostrar padrão de teste" |
| 1615 | 1592 | msgid "Smart paste" |
| 1616 | 1593 | msgstr "Colar inteligente" |
| 1617 | 1594 | |
| 1618 | -#: connect.c:598 connect.c:615 | |
| 1595 | +#: connect.c:560 connect.c:577 | |
| 1619 | 1596 | msgid "Socket error" |
| 1620 | 1597 | msgstr "Erro no socket" |
| 1621 | 1598 | |
| 1622 | -#: telnet.c:1058 | |
| 1599 | +#: telnet.c:1054 | |
| 1623 | 1600 | msgid "Socket read error" |
| 1624 | 1601 | msgstr "Erro ao ler dados da rede" |
| 1625 | 1602 | |
| 1626 | -#: telnet.c:2029 | |
| 1603 | +#: telnet.c:2025 | |
| 1627 | 1604 | msgid "Socket write error" |
| 1628 | 1605 | msgstr "Erro ao enviar dados para a rede" |
| 1629 | 1606 | |
| ... | ... | @@ -1669,11 +1646,11 @@ msgstr "" |
| 1669 | 1646 | msgid "Speed" |
| 1670 | 1647 | msgstr "Velocidade" |
| 1671 | 1648 | |
| 1672 | -#: ft/ftdialog.c:404 | |
| 1649 | +#: ft/ftdialog.c:408 | |
| 1673 | 1650 | msgid "Start download." |
| 1674 | 1651 | msgstr "Iniciar recebimento." |
| 1675 | 1652 | |
| 1676 | -#: ft/ftdialog.c:404 | |
| 1653 | +#: ft/ftdialog.c:408 | |
| 1677 | 1654 | msgid "Start upload." |
| 1678 | 1655 | msgstr "Iniciar envio." |
| 1679 | 1656 | |
| ... | ... | @@ -1693,7 +1670,7 @@ msgstr "Divergência na identidade do emissor" |
| 1693 | 1670 | msgid "System _type:" |
| 1694 | 1671 | msgstr "Tipo de servidor:" |
| 1695 | 1672 | |
| 1696 | -#: telnet.c:1518 | |
| 1673 | +#: telnet.c:1514 | |
| 1697 | 1674 | msgid "TLS negotiation failure" |
| 1698 | 1675 | msgstr "Negociação TLS falhou" |
| 1699 | 1676 | |
| ... | ... | @@ -1931,7 +1908,7 @@ msgstr "" |
| 1931 | 1908 | msgid "This program requires GTK version %d.%d.%d" |
| 1932 | 1909 | msgstr "Este programa precisa do GTK versão %d.%d.%d" |
| 1933 | 1910 | |
| 1934 | -#: connect.c:331 | |
| 1911 | +#: connect.c:326 | |
| 1935 | 1912 | #, c-format |
| 1936 | 1913 | msgid "" |
| 1937 | 1914 | "This version of %s was built without support for secure sockets layer (SSL)." |
| ... | ... | @@ -1993,7 +1970,7 @@ msgstr "UTF-8" |
| 1993 | 1970 | msgid "Uknown DFT Open type from host" |
| 1994 | 1971 | msgstr "Host enviou código de abertura DFT desconhecido" |
| 1995 | 1972 | |
| 1996 | -#: connect.c:330 | |
| 1973 | +#: connect.c:325 | |
| 1997 | 1974 | msgid "Unable to connect to secure hosts" |
| 1998 | 1975 | msgstr "Não é possível conectar em servidores seguros" |
| 1999 | 1976 | |
| ... | ... | @@ -2010,7 +1987,7 @@ msgstr "" |
| 2010 | 1987 | msgid "Unable to decrypt certificate's signature" |
| 2011 | 1988 | msgstr "Incapaz de decifrar a assinatura do certificado" |
| 2012 | 1989 | |
| 2013 | -#: connect.c:198 | |
| 1990 | +#: connect.c:193 | |
| 2014 | 1991 | msgid "Unable to find selected hostname." |
| 2015 | 1992 | msgstr "Não consegui encontrar o host selecionado." |
| 2016 | 1993 | |
| ... | ... | @@ -2138,25 +2115,11 @@ msgstr "PF %d desconhecida" |
| 2138 | 2115 | msgid "Unknown frame type from host" |
| 2139 | 2116 | msgstr "Servidor enviou tipo de frame desconhecido" |
| 2140 | 2117 | |
| 2141 | -#: resolver.c:166 | |
| 2142 | -#, c-format | |
| 2143 | -msgid "" | |
| 2144 | -"Unknown host:\n" | |
| 2145 | -"%s" | |
| 2146 | -msgstr "" | |
| 2147 | -"Servidor desconhecido:\n" | |
| 2148 | -"%s" | |
| 2149 | - | |
| 2150 | 2118 | #: uiparser/popup.c:76 |
| 2151 | 2119 | #, c-format |
| 2152 | 2120 | msgid "Unknown popup type \"%s\"" |
| 2153 | 2121 | msgstr "Tipo de popup \"%s\" não é conhecido" |
| 2154 | 2122 | |
| 2155 | -#: resolver.c:147 | |
| 2156 | -#, c-format | |
| 2157 | -msgid "Unknown port number or service: %s" | |
| 2158 | -msgstr "Número de porta ou serviço desconhecido: %s" | |
| 2159 | - | |
| 2160 | 2123 | #: rpq.c:227 |
| 2161 | 2124 | msgid "Unsupported RPQ term" |
| 2162 | 2125 | msgstr "Unsupported RPQ term" |
| ... | ... | @@ -2186,18 +2149,10 @@ msgstr "Versão %s - Revisão %s" |
| 2186 | 2149 | msgid "View Field Delimiters" |
| 2187 | 2150 | msgstr "Mostrar delimitadores de campo" |
| 2188 | 2151 | |
| 2189 | -#: connect.c:374 | |
| 2190 | -msgid "WSAEventSelect failed" | |
| 2191 | -msgstr "WSAEventSelect falhou" | |
| 2192 | - | |
| 2193 | -#: connect.c:162 | |
| 2152 | +#: connect.c:157 | |
| 2194 | 2153 | msgid "WSAStartup failed" |
| 2195 | 2154 | msgstr "WSAStartup falhou" |
| 2196 | 2155 | |
| 2197 | -#: iocalls.c:429 | |
| 2198 | -msgid "WaitForMultipleObjects() failed when processing for events." | |
| 2199 | -msgstr "WaitForMultipleObjects() falhou ao processar eventos" | |
| 2200 | - | |
| 2201 | 2156 | #: ft.c:433 |
| 2202 | 2157 | msgid "Waiting for GET response" |
| 2203 | 2158 | msgstr "Aguardando resposta do pedido de download" |
| ... | ... | @@ -2287,8 +2242,8 @@ msgstr "_Adicionar ao arquivo de destino" |
| 2287 | 2242 | msgid "_Browse" |
| 2288 | 2243 | msgstr "_Procurar" |
| 2289 | 2244 | |
| 2290 | -#: v3270/hostselect.c:390 filetransfer.c:250 ft/ftdialog.c:133 | |
| 2291 | -#: ft/ftdialog.c:407 | |
| 2245 | +#: v3270/hostselect.c:389 filetransfer.c:250 ft/ftdialog.c:133 | |
| 2246 | +#: ft/ftdialog.c:398 | |
| 2292 | 2247 | msgid "_Cancel" |
| 2293 | 2248 | msgstr "_Cancelar" |
| 2294 | 2249 | |
| ... | ... | @@ -2340,7 +2295,7 @@ msgstr "_Rede" |
| 2340 | 2295 | msgid "_Options" |
| 2341 | 2296 | msgstr "_Opções" |
| 2342 | 2297 | |
| 2343 | -#: ft/ftdialog.c:399 | |
| 2298 | +#: ft/ftdialog.c:403 | |
| 2344 | 2299 | msgid "_Receive" |
| 2345 | 2300 | msgstr "_Receber" |
| 2346 | 2301 | |
| ... | ... | @@ -2352,13 +2307,13 @@ msgstr "_Gravar" |
| 2352 | 2307 | msgid "_Secure connection." |
| 2353 | 2308 | msgstr "Conexão _Segura." |
| 2354 | 2309 | |
| 2355 | -#: ft/ftdialog.c:134 ft/ftdialog.c:399 | |
| 2310 | +#: ft/ftdialog.c:134 ft/ftdialog.c:403 | |
| 2356 | 2311 | msgid "_Send" |
| 2357 | 2312 | msgstr "_Enviar" |
| 2358 | 2313 | |
| 2359 | 2314 | #: v3270/hostselect.c:148 |
| 2360 | 2315 | msgid "_Service:" |
| 2361 | -msgstr "_Service:" | |
| 2316 | +msgstr "_Serviço:" | |
| 2362 | 2317 | |
| 2363 | 2318 | #: ft/ftdialog.c:454 ft/ftdialog.c:544 |
| 2364 | 2319 | msgid "_Text file." |
| ... | ... | @@ -2389,27 +2344,27 @@ msgstr "Atributo inesperado \"action\" em <%s>" |
| 2389 | 2344 | msgid "an action attribute" |
| 2390 | 2345 | msgstr "um atributo \"action\"" |
| 2391 | 2346 | |
| 2392 | -#: session.c:340 | |
| 2347 | +#: session.c:335 | |
| 2393 | 2348 | msgid "bracket" |
| 2394 | 2349 | msgstr "bracket" |
| 2395 | 2350 | |
| 2396 | -#: toggles.c:177 connect.c:387 connect.c:482 | |
| 2351 | +#: toggles.c:177 connect.c:354 connect.c:449 | |
| 2397 | 2352 | msgid "disable" |
| 2398 | 2353 | msgstr "desabilitar" |
| 2399 | 2354 | |
| 2400 | -#: toggles.c:177 connect.c:387 connect.c:482 | |
| 2355 | +#: toggles.c:177 connect.c:354 connect.c:449 | |
| 2401 | 2356 | msgid "enable" |
| 2402 | 2357 | msgstr "enable" |
| 2403 | 2358 | |
| 2404 | -#: connect.c:599 | |
| 2359 | +#: connect.c:561 | |
| 2405 | 2360 | msgid "fcntl() error when getting socket state." |
| 2406 | 2361 | msgstr "fcntl() error when getting socket state." |
| 2407 | 2362 | |
| 2408 | -#: connect.c:407 connect.c:586 | |
| 2363 | +#: connect.c:374 connect.c:548 | |
| 2409 | 2364 | msgid "ioctlsocket(FIONBIO) failed." |
| 2410 | 2365 | msgstr "ioctlsocket(FIONBIO) failed." |
| 2411 | 2366 | |
| 2412 | -#: connect.c:437 connect.c:471 | |
| 2367 | +#: connect.c:404 connect.c:438 | |
| 2413 | 2368 | msgid "setsockopt(SO_OOBINLINE) has failed" |
| 2414 | 2369 | msgstr "setsockopt(SO_OOBINLINE) has failed" |
| 2415 | 2370 | |
| ... | ... | @@ -2417,10 +2372,44 @@ msgstr "setsockopt(SO_OOBINLINE) has failed" |
| 2417 | 2372 | msgid "translator-credits" |
| 2418 | 2373 | msgstr "translator-credits" |
| 2419 | 2374 | |
| 2420 | -#: telnet.c:1033 | |
| 2375 | +#: telnet.c:1029 | |
| 2421 | 2376 | msgid "unknown error" |
| 2422 | 2377 | msgstr "Erro desconhecido" |
| 2423 | 2378 | |
| 2379 | +#~ msgid "Select hostname" | |
| 2380 | +#~ msgstr "Selecione host" | |
| 2381 | + | |
| 2382 | +#~ msgid "Set hostname" | |
| 2383 | +#~ msgstr "Selecione servidor" | |
| 2384 | + | |
| 2385 | +#~ msgid "%s: unknown family %d" | |
| 2386 | +#~ msgstr "%s: Familia %d é inválida" | |
| 2387 | + | |
| 2388 | +#~ msgid "Cannot create socket event" | |
| 2389 | +#~ msgstr "Não foi possível criar um semáforo para comunicação" | |
| 2390 | + | |
| 2391 | +#~ msgid "Error %d resolving %s" | |
| 2392 | +#~ msgstr "Erro %d resolvendo %s" | |
| 2393 | + | |
| 2394 | +#~ msgid "Error resolving %s: %s" | |
| 2395 | +#~ msgstr "Erro ao resolver %s: %s" | |
| 2396 | + | |
| 2397 | +#~ msgid "" | |
| 2398 | +#~ "Unknown host:\n" | |
| 2399 | +#~ "%s" | |
| 2400 | +#~ msgstr "" | |
| 2401 | +#~ "Servidor desconhecido:\n" | |
| 2402 | +#~ "%s" | |
| 2403 | + | |
| 2404 | +#~ msgid "Unknown port number or service: %s" | |
| 2405 | +#~ msgstr "Número de porta ou serviço desconhecido: %s" | |
| 2406 | + | |
| 2407 | +#~ msgid "WSAEventSelect failed" | |
| 2408 | +#~ msgstr "WSAEventSelect falhou" | |
| 2409 | + | |
| 2410 | +#~ msgid "WaitForMultipleObjects() failed when processing for events." | |
| 2411 | +#~ msgstr "WaitForMultipleObjects() falhou ao processar eventos" | |
| 2412 | + | |
| 2424 | 2413 | #~ msgid "Host is AS/400" |
| 2425 | 2414 | #~ msgstr "Servidor é AS/400" |
| 2426 | 2415 | ... | ... |
src/include/lib3270.h
| ... | ... | @@ -664,7 +664,7 @@ |
| 664 | 664 | |
| 665 | 665 | void * (*AddExcept)(int source, H3270 *session, void (*fn)(H3270 *session)); |
| 666 | 666 | |
| 667 | - int (*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm); | |
| 667 | +// int (*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm); | |
| 668 | 668 | |
| 669 | 669 | int (*Wait)(H3270 *hSession, int seconds); |
| 670 | 670 | int (*event_dispatcher)(H3270 *hSession, int wait); |
| ... | ... | @@ -753,7 +753,7 @@ |
| 753 | 753 | * @param parm Parameter to be passed to the function. |
| 754 | 754 | * |
| 755 | 755 | */ |
| 756 | - LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 *h, void *parm); | |
| 756 | +// LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 *h, void *parm); | |
| 757 | 757 | |
| 758 | 758 | |
| 759 | 759 | /** | ... | ... |
src/lib3270/iocalls.c
| ... | ... | @@ -55,7 +55,7 @@ static void * internal_add_input(int source, H3270 *session, void (*fn)(H3270 *s |
| 55 | 55 | static void * internal_add_output(int source, H3270 *session, void (*fn)(H3270 *session)); |
| 56 | 56 | static void * internal_add_except(int source, H3270 *session, void (*fn)(H3270 *session)); |
| 57 | 57 | |
| 58 | -static int internal_callthread(int(*callback)(H3270 *, void *), H3270 *session, void *parm); | |
| 58 | +// static int internal_callthread(int(*callback)(H3270 *, void *), H3270 *session, void *parm); | |
| 59 | 59 | static int internal_wait(H3270 *hSession, int seconds); |
| 60 | 60 | |
| 61 | 61 | static int internal_event_dispatcher(H3270 *hSession, int block); |
| ... | ... | @@ -81,8 +81,8 @@ static void internal_ring_bell(H3270 *); |
| 81 | 81 | static void * (*add_except)(int source, H3270 *session, void (*fn)(H3270 *session)) |
| 82 | 82 | = internal_add_except; |
| 83 | 83 | |
| 84 | - static int (*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm) | |
| 85 | - = internal_callthread; | |
| 84 | +// static int (*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm) | |
| 85 | +// = internal_callthread; | |
| 86 | 86 | |
| 87 | 87 | static int (*wait)(H3270 *hSession, int seconds) |
| 88 | 88 | = internal_wait; |
| ... | ... | @@ -621,10 +621,12 @@ retry: |
| 621 | 621 | |
| 622 | 622 | } |
| 623 | 623 | |
| 624 | +/* | |
| 624 | 625 | static int internal_callthread(int(*callback)(H3270 *, void *), H3270 *session, void *parm) |
| 625 | 626 | { |
| 626 | 627 | return callback(session,parm); |
| 627 | 628 | } |
| 629 | +*/ | |
| 628 | 630 | |
| 629 | 631 | static int internal_wait(H3270 *hSession, int seconds) |
| 630 | 632 | { |
| ... | ... | @@ -755,8 +757,8 @@ LIB3270_EXPORT int lib3270_register_handlers(const struct lib3270_callbacks *cbk |
| 755 | 757 | if(cbk->AddExcept) |
| 756 | 758 | add_except = cbk->AddExcept; |
| 757 | 759 | |
| 758 | - if(cbk->callthread) | |
| 759 | - callthread = cbk->callthread; | |
| 760 | +// if(cbk->callthread) | |
| 761 | +// callthread = cbk->callthread; | |
| 760 | 762 | |
| 761 | 763 | if(cbk->Wait) |
| 762 | 764 | wait = cbk->Wait; |
| ... | ... | @@ -771,6 +773,7 @@ LIB3270_EXPORT int lib3270_register_handlers(const struct lib3270_callbacks *cbk |
| 771 | 773 | |
| 772 | 774 | } |
| 773 | 775 | |
| 776 | +/* | |
| 774 | 777 | LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 *h, void *parm) |
| 775 | 778 | { |
| 776 | 779 | int rc; |
| ... | ... | @@ -786,6 +789,7 @@ LIB3270_EXPORT int lib3270_call_thread(int(*callback)(H3270 *h, void *), H3270 * |
| 786 | 789 | |
| 787 | 790 | return rc; |
| 788 | 791 | } |
| 792 | +*/ | |
| 789 | 793 | |
| 790 | 794 | LIB3270_EXPORT void lib3270_main_iterate(H3270 *hSession, int block) |
| 791 | 795 | { | ... | ... |
src/lib3270/proxy.c
| ... | ... | @@ -694,15 +694,15 @@ static int proxy_socks4(H3270 *hSession, int fd, char *host, unsigned short port |
| 694 | 694 | } |
| 695 | 695 | #endif // HAVE_GETADDRINFO |
| 696 | 696 | |
| 697 | -/* SOCKS version 5 (RFC 1928) proxy. */ | |
| 697 | +/* SOCKS version 5 (RFC 1928) proxy. */ /* | |
| 698 | 698 | static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port, int force_d) |
| 699 | 699 | { |
| 700 | 700 | union { |
| 701 | 701 | struct sockaddr sa; |
| 702 | 702 | struct sockaddr_in sin; |
| 703 | -#if defined(AF_INET6) /*[*/ | |
| 703 | +#if defined(AF_INET6) | |
| 704 | 704 | struct sockaddr_in6 sin6; |
| 705 | -#endif /*]*/ | |
| 705 | +#endif | |
| 706 | 706 | } ha; |
| 707 | 707 | socklen_t ha_len = 0; |
| 708 | 708 | int use_name = 0; |
| ... | ... | @@ -715,7 +715,7 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 715 | 715 | char nbuf[256]; |
| 716 | 716 | int done = 0; |
| 717 | 717 | |
| 718 | -#if defined(X3270_TRACE) /*[*/ | |
| 718 | +#if defined(X3270_TRACE) | |
| 719 | 719 | const char *atype_name[] = |
| 720 | 720 | { |
| 721 | 721 | "", |
| ... | ... | @@ -725,7 +725,7 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 725 | 725 | "IPv6" |
| 726 | 726 | }; |
| 727 | 727 | unsigned char *portp; |
| 728 | -#endif /*]*/ | |
| 728 | +#endif | |
| 729 | 729 | unsigned short rport; |
| 730 | 730 | |
| 731 | 731 | if (force_d) |
| ... | ... | @@ -734,7 +734,7 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 734 | 734 | char errmsg[1024]; |
| 735 | 735 | int rv; |
| 736 | 736 | |
| 737 | - /* Resolve the hostname. */ | |
| 737 | + // Resolve the hostname. | |
| 738 | 738 | rv = resolve_host_and_port(hSession,host, CN, &rport, &ha.sa, &ha_len,errmsg, sizeof(errmsg)); |
| 739 | 739 | if (rv == -2) |
| 740 | 740 | use_name = 1; |
| ... | ... | @@ -744,22 +744,22 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 744 | 744 | } |
| 745 | 745 | } |
| 746 | 746 | |
| 747 | - /* Send the authentication request to the server. */ | |
| 747 | + // Send the authentication request to the server. | |
| 748 | 748 | strcpy((char *)rbuf, "\005\001\000"); |
| 749 | -#if defined(X3270_TRACE) /*[*/ | |
| 749 | +#if defined(X3270_TRACE) | |
| 750 | 750 | trace_dsn(hSession,_("SOCKS5 Proxy: xmit version 5 nmethods 1 (no auth)\n")); |
| 751 | 751 | trace_netdata(hSession, '>', rbuf, 3); |
| 752 | -#endif /*]*/ | |
| 752 | +#endif | |
| 753 | 753 | if (send(fd, (const char *) rbuf, 3, 0) < 0) |
| 754 | 754 | { |
| 755 | 755 | popup_a_sockerr(hSession,_("SOCKS5 Proxy: send error")); |
| 756 | 756 | return -1; |
| 757 | 757 | } |
| 758 | 758 | |
| 759 | - /* | |
| 760 | - * Wait for the server reply. | |
| 761 | - * Read 2 bytes of response. | |
| 762 | - */ | |
| 759 | + // | |
| 760 | + // Wait for the server reply. | |
| 761 | + // Read 2 bytes of response. | |
| 762 | + // | |
| 763 | 763 | nread = 0; |
| 764 | 764 | for (;;) { |
| 765 | 765 | fd_set rfds; |
| ... | ... | @@ -772,10 +772,10 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 772 | 772 | if (select(fd + 1, &rfds, NULL, NULL, &tv) < 0) |
| 773 | 773 | { |
| 774 | 774 | popup_an_error(hSession,_("SOCKS5 Proxy: server timeout")); |
| 775 | -#if defined(X3270_TRACE) /*[*/ | |
| 775 | +#if defined(X3270_TRACE) | |
| 776 | 776 | if (nread) |
| 777 | 777 | trace_netdata(hSession, '<', rbuf, nread); |
| 778 | -#endif /*]*/ | |
| 778 | +#endif | |
| 779 | 779 | return -1; |
| 780 | 780 | } |
| 781 | 781 | |
| ... | ... | @@ -783,28 +783,28 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 783 | 783 | if (nr < 0) |
| 784 | 784 | { |
| 785 | 785 | popup_a_sockerr(hSession,_("SOCKS5 Proxy: receive error")); |
| 786 | -#if defined(X3270_TRACE) /*[*/ | |
| 786 | +#if defined(X3270_TRACE) | |
| 787 | 787 | if (nread) |
| 788 | 788 | trace_netdata(hSession, '<', rbuf, nread); |
| 789 | -#endif /*]*/ | |
| 789 | +#endif | |
| 790 | 790 | return -1; |
| 791 | 791 | } |
| 792 | 792 | if (nr == 0) |
| 793 | 793 | { |
| 794 | 794 | popup_a_sockerr(hSession,_("SOCKS5 Proxy: unexpected EOF")); |
| 795 | -#if defined(X3270_TRACE) /*[*/ | |
| 795 | +#if defined(X3270_TRACE) | |
| 796 | 796 | if (nread) |
| 797 | 797 | trace_netdata(hSession, '<', rbuf, nread); |
| 798 | -#endif /*]*/ | |
| 798 | +#endif | |
| 799 | 799 | return -1; |
| 800 | 800 | } |
| 801 | 801 | if (++nread >= 2) |
| 802 | 802 | break; |
| 803 | 803 | } |
| 804 | 804 | |
| 805 | -#if defined(X3270_TRACE) /*[*/ | |
| 805 | +#if defined(X3270_TRACE) | |
| 806 | 806 | trace_netdata(hSession, '<', rbuf, nread); |
| 807 | -#endif /*]*/ | |
| 807 | +#endif | |
| 808 | 808 | |
| 809 | 809 | if (rbuf[0] != 0x05 || (rbuf[1] != 0 && rbuf[1] != 0xff)) |
| 810 | 810 | { |
| ... | ... | @@ -812,9 +812,9 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 812 | 812 | return -1; |
| 813 | 813 | } |
| 814 | 814 | |
| 815 | -#if defined(X3270_TRACE) /*[*/ | |
| 815 | +#if defined(X3270_TRACE) | |
| 816 | 816 | trace_dsn(hSession,"SOCKS5 Proxy: recv version %d method %d\n", rbuf[0],rbuf[1]); |
| 817 | -#endif /*]*/ | |
| 817 | +#endif | |
| 818 | 818 | |
| 819 | 819 | if (rbuf[1] == 0xff) |
| 820 | 820 | { |
| ... | ... | @@ -822,40 +822,40 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 822 | 822 | return -1; |
| 823 | 823 | } |
| 824 | 824 | |
| 825 | - /* Send the request to the server. */ | |
| 825 | + // Send the request to the server. | |
| 826 | 826 | buf = lib3270_malloc(32 + strlen(host)); |
| 827 | 827 | s = buf; |
| 828 | - *s++ = 0x05; /* protocol version 5 */ | |
| 829 | - *s++ = 0x01; /* CONNECT */ | |
| 830 | - *s++ = 0x00; /* reserved */ | |
| 828 | + *s++ = 0x05; // protocol version 5 | |
| 829 | + *s++ = 0x01; // CONNECT | |
| 830 | + *s++ = 0x00; // reserved | |
| 831 | 831 | if (use_name) { |
| 832 | - *s++ = 0x03; /* domain name */ | |
| 832 | + *s++ = 0x03; // domain name | |
| 833 | 833 | *s++ = strlen(host); |
| 834 | 834 | strcpy(s, host); |
| 835 | 835 | s += strlen(host); |
| 836 | 836 | } else if (ha.sa.sa_family == AF_INET) { |
| 837 | - *s++ = 0x01; /* IPv4 */ | |
| 837 | + *s++ = 0x01; // IPv4 | |
| 838 | 838 | memcpy(s, &ha.sin.sin_addr, 4); |
| 839 | 839 | s += 4; |
| 840 | 840 | strcpy(nbuf, inet_ntoa(ha.sin.sin_addr)); |
| 841 | -#if defined(AF_INET6) /*[*/ | |
| 841 | +#if defined(AF_INET6) | |
| 842 | 842 | } else { |
| 843 | - *s++ = 0x04; /* IPv6 */ | |
| 843 | + *s++ = 0x04; // IPv6 | |
| 844 | 844 | memcpy(s, &ha.sin6.sin6_addr, sizeof(struct in6_addr)); |
| 845 | 845 | s += sizeof(struct in6_addr); |
| 846 | 846 | (void) inet_ntop(AF_INET6, &ha.sin6.sin6_addr, nbuf, sizeof(nbuf)); |
| 847 | -#endif /*]*/ | |
| 847 | +#endif | |
| 848 | 848 | } |
| 849 | 849 | SET16(s, port); |
| 850 | 850 | |
| 851 | -#if defined(X3270_TRACE) /*[*/ | |
| 851 | +#if defined(X3270_TRACE) | |
| 852 | 852 | trace_dsn(hSession,"SOCKS5 Proxy: xmit version 5 connect %s %s port %u\n", |
| 853 | 853 | use_name? "domainname": |
| 854 | 854 | ((ha.sa.sa_family == AF_INET)? "IPv4": "IPv6"), |
| 855 | 855 | use_name? host: nbuf, |
| 856 | 856 | port); |
| 857 | 857 | trace_netdata(hSession, '>', (unsigned char *)buf, s - buf); |
| 858 | -#endif /*]*/ | |
| 858 | +#endif | |
| 859 | 859 | |
| 860 | 860 | if (send(fd, buf, s - buf, 0) < 0) { |
| 861 | 861 | popup_a_sockerr(hSession,_("SOCKS5 Proxy: send error")); |
| ... | ... | @@ -864,11 +864,11 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 864 | 864 | } |
| 865 | 865 | lib3270_free(buf); |
| 866 | 866 | |
| 867 | - /* | |
| 868 | - * Process the reply. | |
| 869 | - * Only the first two bytes of the response are interesting; | |
| 870 | - * skip the rest. | |
| 871 | - */ | |
| 867 | + // | |
| 868 | + // Process the reply. | |
| 869 | + // Only the first two bytes of the response are interesting; | |
| 870 | + // skip the rest. | |
| 871 | + // | |
| 872 | 872 | nread = 0; |
| 873 | 873 | done = 0; |
| 874 | 874 | buf = NULL; |
| ... | ... | @@ -892,19 +892,19 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 892 | 892 | if (nr < 0) |
| 893 | 893 | { |
| 894 | 894 | popup_a_sockerr(hSession,_("SOCKS5 Proxy: receive error")); |
| 895 | -#if defined(X3270_TRACE) /*[*/ | |
| 895 | +#if defined(X3270_TRACE) | |
| 896 | 896 | if (nread) |
| 897 | 897 | trace_netdata(hSession, '<', (unsigned char *)buf, nread); |
| 898 | -#endif /*]*/ | |
| 898 | +#endif | |
| 899 | 899 | return -1; |
| 900 | 900 | } |
| 901 | 901 | if (nr == 0) |
| 902 | 902 | { |
| 903 | 903 | popup_an_error(hSession, _("SOCKS5 Proxy: unexpected EOF")); |
| 904 | -#if defined(X3270_TRACE) /*[*/ | |
| 904 | +#if defined(X3270_TRACE) | |
| 905 | 905 | if (nread) |
| 906 | 906 | trace_netdata(hSession, '<', (unsigned char *)buf, nread); |
| 907 | -#endif /*]*/ | |
| 907 | +#endif | |
| 908 | 908 | return -1; |
| 909 | 909 | } |
| 910 | 910 | |
| ... | ... | @@ -916,18 +916,18 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 916 | 916 | if (r != 0x05) |
| 917 | 917 | { |
| 918 | 918 | popup_an_error(hSession, _("SOCKS5 Proxy: incorrect reply version 0x%02x"), r); |
| 919 | -#if defined(X3270_TRACE) /*[*/ | |
| 919 | +#if defined(X3270_TRACE) | |
| 920 | 920 | if (nread) |
| 921 | 921 | trace_netdata(hSession, '<', (unsigned char *)buf, nread); |
| 922 | -#endif /*]*/ | |
| 922 | +#endif | |
| 923 | 923 | return -1; |
| 924 | 924 | } |
| 925 | 925 | break; |
| 926 | 926 | case 1: |
| 927 | -#if defined(X3270_TRACE) /*[*/ | |
| 927 | +#if defined(X3270_TRACE) | |
| 928 | 928 | if (r != 0x00) |
| 929 | 929 | trace_netdata(hSession, '<', (unsigned char *)buf, nread); |
| 930 | -#endif /*]*/ | |
| 930 | +#endif | |
| 931 | 931 | switch (r) |
| 932 | 932 | { |
| 933 | 933 | case 0x00: |
| ... | ... | @@ -973,17 +973,17 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 973 | 973 | case 0x03: |
| 974 | 974 | n2read = -1; |
| 975 | 975 | break; |
| 976 | -#if defined(AF_INET6) /*[*/ | |
| 976 | +#if defined(AF_INET6) | |
| 977 | 977 | case 0x04: |
| 978 | 978 | n2read = sizeof(struct in6_addr) + 2; |
| 979 | 979 | break; |
| 980 | -#endif /*]*/ | |
| 980 | +#endif | |
| 981 | 981 | default: |
| 982 | 982 | popup_an_error(hSession, _("SOCKS5 Proxy: unknown server address type 0x%02x"), r); |
| 983 | -#if defined(X3270_TRACE) /*[*/ | |
| 983 | +#if defined(X3270_TRACE) | |
| 984 | 984 | if (nread) |
| 985 | 985 | trace_netdata(hSession, '<', (unsigned char *)buf, nread); |
| 986 | -#endif /*]*/ | |
| 986 | +#endif | |
| 987 | 987 | return -1; |
| 988 | 988 | } |
| 989 | 989 | break; |
| ... | ... | @@ -996,29 +996,29 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 996 | 996 | } |
| 997 | 997 | } |
| 998 | 998 | |
| 999 | -#if defined(X3270_TRACE) /*[*/ | |
| 999 | +#if defined(X3270_TRACE) | |
| 1000 | 1000 | trace_netdata(hSession, '<', (unsigned char *)buf, nread); |
| 1001 | 1001 | switch (buf[3]) { |
| 1002 | - case 0x01: /* IPv4 */ | |
| 1002 | + case 0x01: // IPv4 | |
| 1003 | 1003 | memcpy(&ha.sin.sin_addr, &buf[4], 4); |
| 1004 | 1004 | strcpy(nbuf, inet_ntoa(ha.sin.sin_addr)); |
| 1005 | 1005 | portp = (unsigned char *)&buf[4 + 4]; |
| 1006 | 1006 | break; |
| 1007 | - case 0x03: /* domainname */ | |
| 1007 | + case 0x03: // domainname | |
| 1008 | 1008 | strncpy(nbuf, &buf[5], buf[4]); |
| 1009 | 1009 | nbuf[(unsigned char)buf[4]] = '\0'; |
| 1010 | 1010 | portp = (unsigned char *)&buf[5 + (unsigned char)buf[4]]; |
| 1011 | 1011 | break; |
| 1012 | -#if defined(AF_INET6) /*[*/ | |
| 1013 | - case 0x04: /* IPv6 */ | |
| 1012 | +#if defined(AF_INET6) | |
| 1013 | + case 0x04: // IPv6 | |
| 1014 | 1014 | memcpy(&ha.sin6.sin6_addr, &buf[4], sizeof(struct in6_addr)); |
| 1015 | 1015 | (void) inet_ntop(AF_INET6, &ha.sin6.sin6_addr, nbuf, |
| 1016 | 1016 | sizeof(nbuf)); |
| 1017 | 1017 | portp = (unsigned char *)&buf[4 + sizeof(struct in6_addr)]; |
| 1018 | 1018 | break; |
| 1019 | -#endif /*]*/ | |
| 1019 | +#endif | |
| 1020 | 1020 | default: |
| 1021 | - /* can't happen */ | |
| 1021 | + // can't happen | |
| 1022 | 1022 | nbuf[0] = '\0'; |
| 1023 | 1023 | portp = (unsigned char *)buf; |
| 1024 | 1024 | break; |
| ... | ... | @@ -1029,8 +1029,9 @@ static int proxy_socks5(H3270 *hSession, int fd, char *host, unsigned short port |
| 1029 | 1029 | atype_name[(unsigned char)buf[3]], |
| 1030 | 1030 | nbuf, |
| 1031 | 1031 | rport); |
| 1032 | -#endif /*]*/ | |
| 1032 | +#endif | |
| 1033 | 1033 | lib3270_free(buf); |
| 1034 | 1034 | |
| 1035 | 1035 | return 0; |
| 1036 | 1036 | } |
| 1037 | +*/ | ... | ... |
src/lib3270/resolver.c
| ... | ... | @@ -83,7 +83,7 @@ struct parms |
| 83 | 83 | * Resolve a hostname and port. |
| 84 | 84 | * Returns 0 for success, -1 for fatal error (name resolution impossible), |
| 85 | 85 | * -2 for simple error (cannot resolve the name). |
| 86 | - */ | |
| 86 | + */ /* | |
| 87 | 87 | static int cresolve_host_and_port(H3270 *h, struct parms *p) |
| 88 | 88 | { |
| 89 | 89 | #if defined( HAVE_GETADDRINFO ) || defined(WIN32) |
| ... | ... | @@ -91,7 +91,7 @@ static int cresolve_host_and_port(H3270 *h, struct parms *p) |
| 91 | 91 | struct addrinfo hints, *res; |
| 92 | 92 | int rc; |
| 93 | 93 | |
| 94 | - /* Use getaddrinfo() to resolve the hostname and port together. */ | |
| 94 | + // Use getaddrinfo() to resolve the hostname and port together. | |
| 95 | 95 | (void) memset(&hints, '\0', sizeof(struct addrinfo)); |
| 96 | 96 | hints.ai_flags = 0; |
| 97 | 97 | hints.ai_family = PF_UNSPEC; |
| ... | ... | @@ -138,7 +138,7 @@ static int cresolve_host_and_port(H3270 *h, struct parms *p) |
| 138 | 138 | char *ptr; |
| 139 | 139 | struct sockaddr_in *sin = (struct sockaddr_in *) p->sa; |
| 140 | 140 | |
| 141 | - /* Get the port number. */ | |
| 141 | + // Get the port number. | |
| 142 | 142 | lport = strtoul(p->portname, &ptr, 0); |
| 143 | 143 | if (ptr == p->portname || *ptr != '\0' || lport == 0L || lport & ~0xffff) |
| 144 | 144 | { |
| ... | ... | @@ -155,7 +155,7 @@ static int cresolve_host_and_port(H3270 *h, struct parms *p) |
| 155 | 155 | } |
| 156 | 156 | *p->pport = ntohs(port); |
| 157 | 157 | |
| 158 | - /* Use gethostbyname() to resolve the hostname. */ | |
| 158 | + // Use gethostbyname() to resolve the hostname. | |
| 159 | 159 | hp = gethostbyname(p->host); |
| 160 | 160 | if (hp == (struct hostent *) 0) |
| 161 | 161 | { |
| ... | ... | @@ -178,8 +178,9 @@ static int cresolve_host_and_port(H3270 *h, struct parms *p) |
| 178 | 178 | #endif // HAVE_GETADDRINFO |
| 179 | 179 | |
| 180 | 180 | return 0; |
| 181 | -} | |
| 181 | +} */ | |
| 182 | 182 | |
| 183 | +/* | |
| 183 | 184 | int resolve_host_and_port(H3270 *hSession, const char *host, char *portname, unsigned short *pport,struct sockaddr *sa, socklen_t *sa_len, char *errmsg, int em_len) |
| 184 | 185 | { |
| 185 | 186 | int rc; |
| ... | ... | @@ -203,3 +204,4 @@ int resolve_host_and_port(H3270 *hSession, const char *host, char *portname, uns |
| 203 | 204 | return rc; |
| 204 | 205 | |
| 205 | 206 | } |
| 207 | +*/ | ... | ... |
src/lib3270/resolverc.h
| ... | ... | @@ -17,6 +17,6 @@ |
| 17 | 17 | * Hostname resolution. |
| 18 | 18 | */ |
| 19 | 19 | |
| 20 | -LIB3270_INTERNAL int resolve_host_and_port(H3270 *session, const char *host, char *portname, unsigned short *pport,struct sockaddr *sa, socklen_t *sa_len, char *errmsg, int em_size); | |
| 20 | +// LIB3270_INTERNAL int resolve_host_and_port(H3270 *session, const char *host, char *portname, unsigned short *pport,struct sockaddr *sa, socklen_t *sa_len, char *errmsg, int em_size); | |
| 21 | 21 | |
| 22 | 22 | ... | ... |
src/pw3270/v3270/hostselect.c
| ... | ... | @@ -383,7 +383,7 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) |
| 383 | 383 | |
| 384 | 384 | GtkWidget * dialog = v3270_host_select_new(widget); |
| 385 | 385 | GtkWidget * win = gtk_dialog_new_with_buttons( |
| 386 | - _( "Select hostname" ), | |
| 386 | + _( "Configure host" ), | |
| 387 | 387 | GTK_WINDOW(gtk_widget_get_toplevel(widget)), |
| 388 | 388 | GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, |
| 389 | 389 | _( "_Cancel" ), GTK_RESPONSE_REJECT, | ... | ... |
src/pw3270/v3270/iocallback.c
| ... | ... | @@ -43,7 +43,7 @@ |
| 43 | 43 | #include <glib.h> |
| 44 | 44 | #include "../globals.h" |
| 45 | 45 | |
| 46 | -static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm); | |
| 46 | +// static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm); | |
| 47 | 47 | static void static_RemoveSource(void *id); |
| 48 | 48 | |
| 49 | 49 | static void * static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session)); |
| ... | ... | @@ -265,6 +265,7 @@ gpointer BgCall(struct bgParameter *p) |
| 265 | 265 | return 0; |
| 266 | 266 | } |
| 267 | 267 | |
| 268 | +/* | |
| 268 | 269 | static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm) |
| 269 | 270 | { |
| 270 | 271 | struct bgParameter p = { TRUE, session, -1, callback, parm }; |
| ... | ... | @@ -286,6 +287,7 @@ static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *ses |
| 286 | 287 | |
| 287 | 288 | return p.rc; |
| 288 | 289 | } |
| 290 | +*/ | |
| 289 | 291 | |
| 290 | 292 | static int static_Sleep(H3270 *hSession, int seconds) |
| 291 | 293 | { |
| ... | ... | @@ -333,12 +335,13 @@ void v3270_register_io_handlers(v3270Class *cls) |
| 333 | 335 | |
| 334 | 336 | static_AddExcept, |
| 335 | 337 | |
| 338 | +/* | |
| 336 | 339 | #ifdef G_THREADS_ENABLED |
| 337 | 340 | static_CallAndWait, |
| 338 | 341 | #else |
| 339 | 342 | NULL, |
| 340 | 343 | #endif |
| 341 | - | |
| 344 | +*/ | |
| 342 | 345 | static_Sleep, |
| 343 | 346 | static_RunPendingEvents, |
| 344 | 347 | beep | ... | ... |
ui/00default.xml
| ... | ... | @@ -89,7 +89,7 @@ |
| 89 | 89 | <menu name='ScriptsMenu' label='Scripts' visible='no' /> |
| 90 | 90 | |
| 91 | 91 | <menu name='NetworkMenu' label='_Network' > |
| 92 | - <menuitem action='hostname' icon='home' group='offline' label='Set hostname' /> | |
| 92 | + <menuitem action='hostname' icon='home' group='offline' label='Configure host' /> | |
| 93 | 93 | |
| 94 | 94 | <!-- |
| 95 | 95 | If you want to connect to specific host use host='uri' to set it | ... | ... |