Updating translations.

Perry Werneck
1 parent 367055b6
Showing 3 changed files with 1147 additions and 958 deletions Show diff stats
Makefile.in
locale/pt_BR.po
locale/pw3270.pot
@@ -253,6 +253,8 @@ endif
 locale: \
 	locale/$(PACKAGE_TARNAME).pot
  
+	$(MAKE) -C locale all
+
 locale/$(PACKAGE_TARNAME).pot: \
 	$(POTDIR)/pw3270.pot \
 	$(POTDIR)/lib3270.pot \
@@ -5,8 +5,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-08 14:15-0300\n"
-"PO-Revision-Date: 2019-07-08 14:18-0300\n"
+"POT-Creation-Date: 2019-07-30 10:50-0300\n"
+"PO-Revision-Date: 2019-07-30 10:58-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
 "Language: pt_BR\n"
@@ -24,68 +24,73 @@ msgstr &quot;&quot;
 msgid " and <b>%s</b> for %s."
 msgstr " e <b>%s</b> para %s."
  
-#: telnet.c:688 iocalls.c:563 iocalls.c:580 linux/connect.c:80
-#: linux/connect.c:96
+#: src/core/telnet.c:689 src/core/iocalls.c:566 src/core/iocalls.c:583
+#: src/core/linux/connect.c:82 src/core/linux/connect.c:98
 #, c-format
 msgid "%s"
 msgstr "%s"
  
+#: src/core/connect.c:160
+#, c-format
+msgid "%s (SSL error %d)"
+msgstr "%s (erro SSL %d)"
+
 #: window.c:363
 #, c-format
 msgid "%s - Disconnected"
 msgstr "%s - Desconectado"
  
-#: actions.c:853 actions.c:865
+#: actions.c:824 actions.c:836
 #, c-format
 msgid "%s action needs a valid id attribute"
 msgstr "Ação %s exige um atributo ID válido"
  
-#: actions.c:701 actions.c:830 actions.c:842
+#: actions.c:672 actions.c:801 actions.c:813
 #, c-format
 msgid "%s action needs a valid toggle name"
 msgstr "Ação %s exige um nome de toggle válido"
  
-#: actions.c:877
+#: actions.c:848
 #, c-format
 msgid "%s action needs a valid value"
 msgstr "Ação %s precisa de um valor válido"
  
-#: actions.c:587
+#: actions.c:558
 #, c-format
 msgid "%s action needs src attribute"
 msgstr "Ação %s precisa do atributo src"
  
-#: main.c:100
+#: main.c:88
 #, c-format
 msgid "%s requires GTK version %d.%d.%d"
 msgstr "%s requer GTK versão %d.%d.%d"
  
-#: kybd.c:2441
+#: src/core/kybd.c:2444
 #, c-format
 msgid "%s: Bell not supported"
 msgstr "%s: Alerta sonoro não suportado"
  
-#: kybd.c:2600
+#: src/core/kybd.c:2603
 #, c-format
 msgid "%s: Missing hex digits after \\x"
 msgstr "%s: Faltando dígitos hexadecimais após \\x"
  
-#: kybd.c:2540
+#: src/core/kybd.c:2543
 #, c-format
 msgid "%s: Unknown character after \\p"
 msgstr "%s: Caractere desconhecido depois de \\p"
  
-#: kybd.c:2576
+#: src/core/kybd.c:2579
 #, c-format
 msgid "%s: Unknown character after \\pa"
 msgstr "%s: Caractere desconhecido depois de \\pa"
  
-#: kybd.c:2554
+#: src/core/kybd.c:2557
 #, c-format
 msgid "%s: Unknown character after \\pf"
 msgstr "%s: Caractere desconhecido depois de \\pf"
  
-#: kybd.c:2492
+#: src/core/kybd.c:2495
 #, c-format
 msgid "%s: Vertical tab not supported"
 msgstr "%s: Tabulação vertical não é suportada"
@@ -95,7 +100,7 @@ msgstr &quot;%s: Tabulação vertical não é suportada&quot;
 msgid "%s<b>%s</b> for %s"
 msgstr "%s<b>%s</b> para %s"
  
-#: main.c:391
+#: main.c:322
 msgid "- 3270 Emulator for Gtk"
 msgstr "- Emulador 3270 para GTK"
  
@@ -103,7 +108,8 @@ msgstr &quot;- Emulador 3270 para GTK&quot;
 msgid "16 colors"
 msgstr "16 cores"
  
-#: screen.c:814 screen.c:851 screen.c:869 screen.c:994
+#: src/core/screen.c:816 src/core/screen.c:853 src/core/screen.c:871
+#: src/core/screen.c:996
 msgid "3270 Error"
 msgstr "Erro 3270"
  
@@ -113,15 +119,15 @@ msgstr &quot;Erro 3270&quot;
 msgid "3270 File transfer"
 msgstr "Transferência de arquivos 3270"
  
-#: screen.c:832
+#: src/core/screen.c:834
 msgid "3270 Warning"
 msgstr "Alerta 3270"
  
-#: src/terminal/accessible.c:100
+#: src/terminal/accessible.c:101
 msgid "3270 screen"
 msgstr "Tela 3270"
  
-#: dialog.c:496
+#: dialog.c:322
 #, c-format
 msgid "3270 terminal emulator for GTK %d.%d"
 msgstr "Emulador 3270 para GTK+ %d.%d"
@@ -156,7 +162,7 @@ msgstr &quot;&lt;%s&gt; deve estar no primeiro nível&quot;
 msgid "<b>%s</b>\n"
 msgstr "<b>%s</b>\n"
  
-#: src/terminal/widget.c:199
+#: src/terminal/widget.c:198
 msgid ""
 "<b>Identity not verified</b>\n"
 "Disconnected from host"
@@ -168,7 +174,7 @@ msgstr &quot;&quot;
 msgid "<b>Text options</b>"
 msgstr "<b>Opções de texto</b>"
  
-#: main.c:411
+#: main.c:341
 msgid ""
 "<b>Valid options:</b>\n"
 "\n"
@@ -184,7 +190,7 @@ msgstr &quot;&lt;menuitem&gt; deve estar dentro de &lt;menu&gt;&quot;
 msgid "<separator> should be inside a <menu> or <toolbar>"
 msgstr "<separator> só é válido dentro de <menu> ou <toolbar>"
  
-#: ssl/state.c:286
+#: src/ssl/state.c:280
 msgid ""
 "A CA certificate is invalid. Either it is not a CA or its extensions are not "
 "consistent with the supplied purpose."
@@ -196,11 +202,11 @@ msgstr &quot;&quot;
 msgid "A_ppend to file"
 msgstr "_Adicionar ao arquivo"
  
-#: ft.c:103
+#: src/core/ft.c:104
 msgid "Abort sent; awaiting response"
 msgstr "Cancelamento enviado; aguardando resposta"
  
-#: ft.c:676
+#: src/core/ft.c:677
 msgid "Aborting..."
 msgstr "Cancelando..."
  
@@ -208,11 +214,11 @@ msgstr &quot;Cancelando...&quot;
 msgid "About security"
 msgstr "Sobre a segurança"
  
-#: ft.c:101
+#: src/core/ft.c:102
 msgid "Ack received, data flowing"
 msgstr "Confirmação recebida, transferindo dados"
  
-#: paste.c:335
+#: src/core/paste.c:340
 msgid "Action failed"
 msgstr "Ação falhou"
  
@@ -228,19 +234,20 @@ msgstr &quot;Adicionar à cópia&quot;
 msgid "Address or name of the host to connect."
 msgstr "Endereço ou nome do host a conectar."
  
-#: toggles.c:201 00default.xml:129
+#: src/core/toggles.c:202 00default.xml:129
 msgid "Alert sound"
 msgstr "Aviso sonoro"
  
 #: src/filetransfer/v3270ft.c:310 src/filetransfer/settings.c:212
+#: src/dialogs/save/save.c:129
 msgid "All files"
 msgstr "Todos os arquivos"
  
-#: ftmessages.c:67 src/filetransfer/v3270ftprogress.c:82
+#: src/core/ftmessages.c:67 src/filetransfer/v3270ftprogress.c:82
 msgid "An error exists in the PC's file name."
 msgstr "Existe um erro no nome do arquivo do PC."
  
-#: ftmessages.c:46 src/filetransfer/v3270ftprogress.c:64
+#: src/core/ftmessages.c:46 src/filetransfer/v3270ftprogress.c:64
 msgid ""
 "An error occurred in the file transfer, which may be an error in the data "
 "being transferred, or an unidentified system error."
@@ -248,12 +255,12 @@ msgstr &quot;&quot;
 "Um erro ocorreu na transferência de arquivos, pode ser um erro nos dados "
 "sendo transferidos ou um erro de sistema não identificado."
  
-#: ssl/state.c:231
+#: src/ssl/state.c:225
 msgid "An error occurred trying to allocate memory. This should never happen."
 msgstr ""
 "Ocorreu um erro ao tentar alocar memória. Isso nunca deveria acontecer."
  
-#: ftmessages.c:102 src/filetransfer/v3270ftprogress.c:112
+#: src/core/ftmessages.c:102 src/filetransfer/v3270ftprogress.c:112
 msgid "An invalid SEND or RECEIVE parameter was sent to the host."
 msgstr "Um parametro de ENVIO/RECEBIMENTO inválido foi enviado para o host."
  
@@ -261,11 +268,11 @@ msgstr &quot;Um parametro de ENVIO/RECEBIMENTO inválido foi enviado para o host.&quot;
 msgid "Appends the source file to the destination file."
 msgstr "Adiciona conteúdo do arquivo origem ao final do arquivo destino."
  
-#: main.c:377 main.c:379
+#: main.c:313 main.c:315
 msgid "Application name"
 msgstr "Nome da aplicação"
  
-#: main.c:431 main.c:436
+#: main.c:363 main.c:368
 #, c-format
 msgid "Application name set to \"%s\""
 msgstr "Nome da aplicação definido para \"%s\""
@@ -274,28 +281,28 @@ msgstr &quot;Nome da aplicação definido para \&quot;%s\&quot;&quot;
 msgid "Attn"
 msgstr "Attn"
  
-#: actions.c:562
+#: actions.c:533
 #, c-format
 msgid "Attribute \"%s\" is invalid or undefined"
 msgstr "Atributo \"%s\" é invalido ou indefinido"
  
-#: ssl/state.c:341
+#: src/ssl/state.c:335
 msgid "Authority and issuer serial number mismatch"
 msgstr "Divergência nos números de série da autoridade e emissor "
  
-#: ssl/state.c:333
+#: src/ssl/state.c:327
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
  
-#: toggles.c:214
+#: src/core/toggles.c:215
 msgid "Auto resize on altscreen"
 msgstr "Mudar automaticamente o tamanho do terminal em tela alternativa"
  
-#: toggles.c:153 00default.xml:124
+#: src/core/toggles.c:154 00default.xml:124
 msgid "Auto-Reconnect"
 msgstr "Reconectar automaticamente"
  
-#: toggles.c:112
+#: src/core/toggles.c:113
 msgid ""
 "Automatically convert trailing blanks in a field to NULLs in order to insert "
 "a character, and will automatically convert leading NULLs to blanks so that "
@@ -305,7 +312,7 @@ msgstr &quot;&quot;
 "a character, and will automatically convert leading NULLs to blanks so that "
 "input data is not squeezed to the left"
  
-#: toggles.c:154
+#: src/core/toggles.c:155
 msgid "Automatically reconnect to the host if it ever disconnects"
 msgstr "Reconecta automaticamente caso o servidor desconecte"
  
@@ -313,7 +320,7 @@ msgstr &quot;Reconecta automaticamente caso o servidor desconecte&quot;
 msgid "Avblock"
 msgstr "Avblock"
  
-#: ft.c:102
+#: src/core/ft.c:103
 msgid "Awaiting chance to send an abort"
 msgstr "Aguardando para enviar pedido de cancelamento"
  
@@ -325,7 +332,7 @@ msgstr &quot;Iniciar transferência&quot;
 msgid "Background"
 msgstr "Fundo"
  
-#: toggles.c:202
+#: src/core/toggles.c:203
 msgid "Beep on errors"
 msgstr "Emitir som nos erros"
  
@@ -333,11 +340,11 @@ msgstr &quot;Emitir som nos erros&quot;
 msgid "Black"
 msgstr "Preto"
  
-#: toggles.c:111 00default.xml:122
+#: src/core/toggles.c:112 00default.xml:122
 msgid "Blank Fill"
 msgstr "Completar com espaços"
  
-#: toggles.c:81 00default.xml:115
+#: src/core/toggles.c:82 00default.xml:115
 msgid "Blinking Cursor"
 msgstr "Cursor piscante"
  
@@ -349,11 +356,11 @@ msgstr &quot;Tamanho do bloco:&quot;
 msgid "Blue"
 msgstr "Azul"
  
-#: toggles.c:171 00default.xml:125
+#: src/core/toggles.c:172 00default.xml:125
 msgid "Bold"
 msgstr "Negrito"
  
-#: dialog.c:539
+#: dialog.c:365
 msgid "Brazilian Public Software Portal"
 msgstr "Portal do Software Público Brasileiro"
  
@@ -361,30 +368,34 @@ msgstr &quot;Portal do Software Público Brasileiro&quot;
 msgid "Break"
 msgstr "Break"
  
-#: telnet.c:1655
+#: src/core/telnet.c:1656
 msgid "Broken pipe"
 msgstr "Conexão interrompida"
  
-#: ftmessages.c:215
+#: src/core/ftmessages.c:215
 msgid "CMS disk is full: file transfer canceled"
 msgstr "Disco CMS está lotado, transferência cancelada"
  
-#: ftmessages.c:208
+#: src/core/ftmessages.c:208
 msgid "CMS disk is not accessed: file transfer canceled"
 msgstr "Disco CMS não está acessível, transferência cancelada"
  
-#: ftmessages.c:201
+#: src/core/ftmessages.c:201
 msgid "CMS disk is read-only: file transfer canceled"
 msgstr "Disco CMS apenas para leitura, transferência cancelada"
  
-#: ftmessages.c:194
+#: src/core/ftmessages.c:194
 msgid "CMS file not found: file transfer canceled"
 msgstr "Arquivo CMS não encontrado, transferência cancelada"
  
-#: ssl/state.c:154
+#: src/ssl/state.c:148
 msgid "CRL signature failure"
 msgstr "Erro na assinatura CRL"
  
+#: src/dialogs/save/save.c:230
+msgid "C_haracter Coding"
+msgstr "C_odificação de caracteres"
+
 #: dialog.c:121
 msgid "C_haracter Coding:"
 msgstr "C_odificação de caracteres:"
@@ -397,7 +408,7 @@ msgstr &quot;Tema de c_ores:&quot;
 msgid "C_onnect"
 msgstr "_Conectar"
  
-#: toggles.c:333 linux/connect.c:228
+#: src/core/toggles.c:334 src/core/linux/connect.c:230
 #, c-format
 msgid "Can't %s network keep-alive"
 msgstr "Não foi possível %s opção \"keep-alive\""
@@ -411,42 +422,43 @@ msgstr &quot;Não posso aceitar elemento %s sem nome&quot;
 msgid "Can't add activity"
 msgstr "Não é possível adicionar atividade"
  
-#: ssl/linux/getcrl.c:342
+#: src/ssl/linux/getcrl.c:354
 msgid "Can't bind to LDAP server"
 msgstr "Não foi possível conectar ao servidor LDAP"
  
-#: linux/connect.c:88
+#: src/core/linux/connect.c:90
 #, c-format
 msgid "Can't connect to %s"
 msgstr "Não foi possível conectar a %s"
  
-#: linux/connect.c:178
+#: src/core/linux/connect.c:180
 #, c-format
 msgid "Can't connect to %s:%s"
 msgstr "Não foi possível conectar a %s:%s"
  
-#: src/terminal/selection.c:472
+#: src/selection/text.c:150
 #, c-format
 msgid "Can't convert line %lu from %s to %s"
 msgstr "Não foi possível converter a linha %lu de %s para %s"
  
-#: ssl/linux/getcrl.c:412
-msgid "Can't decode CRL got from LDAP Search"
-msgstr "Não foi possível decodificar o CRL obtido pela pesquisa LDAP"
+#: src/ssl/linux/getcrl.c:280 src/ssl/linux/getcrl.c:426
+#: src/ssl/linux/getcrl.c:523
+msgid "Can't decode CRL"
+msgstr "Não foi possível decodificar arquivo CRL"
+
+#: src/ssl/linux/getcrl.c:576
+msgid "Can't decode CRL got from LDAP server"
+msgstr "Não foi possível decodificar o CRL obtido na pesquisa LDAP"
  
-#: ssl/linux/getcrl.c:378 ssl/linux/getcrl.c:389
+#: src/ssl/linux/getcrl.c:390 src/ssl/linux/getcrl.c:402
 msgid "Can't get LDAP attribute"
 msgstr "Não foi possível obter o atributo LDAP"
  
-#: ft.c:431
+#: src/core/ft.c:432
 msgid "Can't get file size"
 msgstr "Não foi possível obter o tamanho do arquivo"
  
-#: local/session.cc:124 local/session.cc:142
-msgid "Can't get screen contents"
-msgstr "Não foi possível obter o conteúdo da tela"
-
-#: ssl/linux/getcrl.c:320
+#: src/ssl/linux/getcrl.c:332
 msgid "Can't initialize LDAP"
 msgstr "Erro ao inicializar LDAP"
  
@@ -455,7 +467,7 @@ msgstr &quot;Erro ao inicializar LDAP&quot;
 msgid "Can't load %s"
 msgstr "Não foi possível carregar %s"
  
-#: dialog.c:395
+#: dialog.c:221
 msgid "Can't load file"
 msgstr "Não foi possível carregar arquivo"
  
@@ -468,7 +480,7 @@ msgstr &quot;Não foi possível carregar plugin&quot;
 msgid "Can't load plugin %s"
 msgstr "Não foi possível carregar plugin %s"
  
-#: ssl/linux/getcrl.c:247 ssl/linux/getcrl.c:265
+#: src/ssl/linux/getcrl.c:249 src/ssl/linux/getcrl.c:268
 msgid "Can't open CRL File"
 msgstr "Não foi possível abrir arquivo CRL"
  
@@ -502,11 +514,15 @@ msgstr &quot;Erro ao analisar valor de caractere&quot;
 msgid "Can't parse unnamed element"
 msgstr "Incapaz de processar elemento sem nome"
  
-#: src/terminal/callbacks.c:345
+#: src/selection/linux/paste.c:78 src/selection/linux/paste.c:118
+msgid "Can't paste"
+msgstr "Não é possivel colar"
+
+#: src/core/session.c:198 src/terminal/callbacks.c:345
 msgid "Can't print"
 msgstr "Não é possível imprimir"
  
-#: ssl/ctx_init.c:224
+#: src/ssl/ctx_init.c:146
 #, c-format
 msgid "Can't read SSL certificates from \"%s\""
 msgstr "Não foi possível ler certificados SSL de %s"
@@ -516,58 +532,35 @@ msgstr &quot;Não foi possível ler certificados SSL de %s&quot;
 msgid "Can't recognize \"%s\" as a valid host type"
 msgstr "Não reconheço \"%s\" como um tipo de host válido"
  
-#: config.c:575
+#: src/core/session.c:206
+msgid "Can't save"
+msgstr "Não é possível salvar"
+
+#: config.c:573
 #, c-format
 msgid "Can't save \"%s\": %s"
 msgstr "Não foi possível salvar %s: %s"
  
 #: src/filetransfer/save.c:116 src/filetransfer/activitylist.c:437
-#: src/trace/widget.c:493 src/dialogs/transfer.c:96
+#: src/trace/widget.c:495 src/dialogs/transfer.c:96 src/dialogs/save/save.c:495
 #, c-format
 msgid "Can't save %s"
 msgstr "Não foi possível salvar arquivo %s"
  
-#: dialog.c:371
-#, c-format
-msgid ""
-"Can't save copy to file\n"
-"%s"
-msgstr ""
-"Não foi possível salvar cópia para o arquivo\n"
-"%s"
-
-#: dialog.c:217 src/trace/widget.c:497
+#: src/trace/widget.c:499
 msgid "Can't save file"
 msgstr "Não foi possível salvar arquivo"
  
-#: dialog.c:336
-#, c-format
-msgid ""
-"Can't save screen to file\n"
-"%s"
-msgstr ""
-"Não foi possível salvar a tela no arquivo\n"
-"%s"
-
-#: dialog.c:354
-#, c-format
-msgid ""
-"Can't save selection to file\n"
-"%s"
-msgstr ""
-"Não foi possível salvar a seleção para o arquivo\n"
-"%s"
-
 #: window.c:176
 #, c-format
 msgid "Can't save trace data to file %s"
 msgstr "Não foi possível salvar trace no arquivo %s"
  
-#: ssl/linux/getcrl.c:367
+#: src/ssl/linux/getcrl.c:379
 msgid "Can't search LDAP server"
 msgstr "Não foi possível conectar ao servidor LDAP"
  
-#: ssl/linux/getcrl.c:331
+#: src/ssl/linux/getcrl.c:343
 msgid "Can't set LDAP version"
 msgstr "Não é possível setar a versão LDAP"
  
@@ -579,15 +572,15 @@ msgstr &quot;Não foi possível setar a tabela de retornos&quot;
 msgid "Can't set host charset"
 msgstr "Não foi possível definir o charset do host"
  
-#: src/terminal/iocallback.c:198
+#: src/terminal/iocallback.c:199
 msgid "Can't set lib3270 I/O controller"
 msgstr "Não foi possível registrar manipuladores de I/O 3270"
  
-#: iocalls.c:579
+#: src/core/iocalls.c:582
 msgid "Can't set socket to blocking mode."
 msgstr "Não foi possível mudar o socket para o modo blocante."
  
-#: iocalls.c:579
+#: src/core/iocalls.c:582
 msgid "Can't set socket to non blocking mode"
 msgstr "Não foi possível setar o socket para o modo não blocante."
  
@@ -595,15 +588,16 @@ msgstr &quot;Não foi possível setar o socket para o modo não blocante.&quot;
 msgid "Can't start file transfer session"
 msgstr "Não foi possível iniciar transferência de arquivo"
  
-#: ft.c:208
+#: src/core/ft.c:209
 msgid "Can't start file transfer."
 msgstr "Não foi possível iniciar transferência de arquivo."
  
-#: ssl/negotiate.c:223
+#: src/ssl/negotiate.c:177
 msgid "Can't verify."
 msgstr "Não foi possível verificar"
  
-#: src/filetransfer/v3270ftprogress.c:432 src/filetransfer/transfer.c:89
+#: src/terminal/callbacks.c:467 src/filetransfer/v3270ftprogress.c:432
+#: src/filetransfer/transfer.c:89 src/dialogs/save/save.c:150
 msgid "Cancel"
 msgstr "_Cancelar"
  
@@ -611,25 +605,25 @@ msgstr &quot;_Cancelar&quot;
 msgid "Cancel transfer operation."
 msgstr "Cancelar transferência"
  
-#: ft.c:160
+#: src/core/ft.c:161
 msgid "Cancelled by user"
 msgstr "Cancelado pelo usuário"
  
-#: telnet.c:1083
+#: src/core/telnet.c:1084
 msgid "Cannot connect to specified LU"
 msgstr "Não foi possível conectar na LU pedida"
  
-#: ssl/negotiate.c:102
+#: src/ssl/negotiate.c:105
 msgid "Cant create a new SSL structure for current connection."
 msgstr ""
 "Não foi possível criar uma nova estrutura de controle SSL para a conexão "
 "atual."
  
-#: ssl/ctx_init.c:203
+#: src/ssl/ctx_init.c:125
 msgid "Cant initialize the SSL context."
 msgstr "Erro ao inicializar contexto de segurança"
  
-#: ssl/negotiate.c:132
+#: src/ssl/negotiate.c:135
 msgid ""
 "Cant set the file descriptor for the input/output facility for the TLS/SSL "
 "(encrypted) side of ssl."
@@ -637,31 +631,31 @@ msgstr &quot;&quot;
 "Não foi possível definir o descritor de arquivo para a conexão TLS/SSL "
 "(encriptada)."
  
-#: ssl/state.c:170
+#: src/ssl/state.c:164
 msgid "Certificate has expired"
 msgstr "O certificado expirou"
  
-#: ssl/state.c:162
+#: src/ssl/state.c:156
 msgid "Certificate is not yet valid"
 msgstr "O certificado ainda não é válido"
  
-#: ssl/state.c:309
+#: src/ssl/state.c:303
 msgid "Certificate not trusted"
 msgstr "O certificado não é confiável"
  
-#: ssl/state.c:317
+#: src/ssl/state.c:311
 msgid "Certificate rejected"
 msgstr "Certificado rejeitado"
  
-#: ssl/state.c:277
+#: src/ssl/state.c:271
 msgid "Certificate revoked"
 msgstr "Certificado revogado"
  
-#: ssl/state.c:146
+#: src/ssl/state.c:140
 msgid "Certificate signature failure"
 msgstr "Falha na assinatura do certificado"
  
-#: tools.c:312 src/terminal/selection.c:474
+#: tools.c:312 src/selection/text.c:152
 msgid "Charset error"
 msgstr "Erro de codificação de caracteres"
  
@@ -677,6 +671,18 @@ msgstr &quot;Marque se o arquivo contem apenas texto.&quot;
 msgid "Clear"
 msgstr "Limpar"
  
+#: src/dialogs/save/save.c:308
+msgid "Click to cancel operation"
+msgstr "Clique para cancelar operação"
+
+#: src/dialogs/save/save.c:313
+msgid "Click to save file"
+msgstr "Clique para salvar arquivo"
+
+#: src/terminal/properties.c:303
+msgid "Clipboard name"
+msgstr "Nome da área de transferência"
+
 #: colors.c:631
 msgid "Color scheme:"
 msgstr "Tema de cores:"
@@ -689,11 +695,15 @@ msgstr &quot;Configuração de cores&quot;
 msgid "Colors"
 msgstr "Cores"
  
-#: ftmessages.c:73
+#: src/dialogs/save/save.c:55
+msgid "Comma-separated values (CSV)"
+msgstr "Arquivo separado por vírgulas (CSV)"
+
+#: src/core/ftmessages.c:73
 msgid "Command incomplete: file transfer canceled"
 msgstr "Comando incompleto, transferência cancelada"
  
-#: src/trace/widget.c:286
+#: src/trace/widget.c:288
 msgid "Command to execute"
 msgstr "Comando a executar"
  
@@ -701,26 +711,31 @@ msgstr &quot;Comando a executar&quot;
 msgid "Configure host"
 msgstr "Configurar host"
  
-#: toggles.c:189 00default.xml:114
+#: src/core/toggles.c:190 00default.xml:114
 msgid "Connect on startup"
 msgstr "Conectar ao iniciar"
  
-#: iocalls.c:547 linux/connect.c:182 linux/connect.c:214 linux/connect.c:232
+#: src/core/iocalls.c:550 src/core/linux/connect.c:184
+#: src/core/linux/connect.c:216 src/core/linux/connect.c:234
 msgid "Connection error"
 msgstr "Erro de conexão"
  
-#: linux/connect.c:94
+#: src/core/linux/connect.c:96
 msgid "Connection failed"
 msgstr "Conexão falhou"
  
-#: telnet.c:1659
+#: src/core/telnet.c:1660
 msgid "Connection reset by peer"
 msgstr "Conexão foi cancelada pelo servidor"
  
-#: properties.c:249
+#: src/core/properties.c:283
 msgid "Connection state"
 msgstr "Estado da conexão"
  
+#: src/terminal/callbacks.c:468
+msgid "Continue"
+msgstr "Continuar"
+
 #: 00default.xml:58
 msgid "Copy"
 msgstr "Copiar"
@@ -746,11 +761,12 @@ msgstr &quot;&quot;
 msgid "Creates a file with variable-length records."
 msgstr "Cria arquivo com registros de tamanho variável."
  
-#: colors.c:519 toggles.c:141 src/dialogs/colors.c:315 00default.xml:121
+#: colors.c:519 src/core/toggles.c:142 src/dialogs/colors.c:315
+#: 00default.xml:121
 msgid "Cross hair cursor"
 msgstr "Cursor mira"
  
-#: dialog.c:138
+#: dialog.c:138 src/dialogs/save/save.c:239
 #, c-format
 msgid "Current (%s)"
 msgstr "Atual (%s)"
@@ -759,14 +775,14 @@ msgstr &quot;Atual (%s)&quot;
 msgid "Current file"
 msgstr "Arquivo atual"
  
-#: properties.c:228
+#: src/core/properties.c:223
+msgid "Current screen height in rows"
+msgstr "Altura atual da tela em linhas"
+
+#: src/core/properties.c:216
 msgid "Current screen width in columns"
 msgstr "Largura atua da tela em colunas"
  
-#: properties.c:235
-msgid "Current screen width in rows"
-msgstr "Altura atual da tela em linhas"
-
 #: src/filetransfer/tables.c:222
 msgid "Current transfer position"
 msgstr "Posição atual da transferência"
@@ -775,7 +791,7 @@ msgstr &quot;Posição atual da transferência&quot;
 msgid "Current:"
 msgstr "Atual:"
  
-#: properties.c:207
+#: src/core/properties.c:209
 msgid "Cursor address"
 msgstr "Endereço do cursor"
  
@@ -807,7 +823,7 @@ msgstr &quot;Verde Escuro&quot;
 msgid "Dark Turquoise"
 msgstr "Turquesa Escuro"
  
-#: ft_cut.c:156 ft_cut.c:165
+#: src/core/ft_cut.c:157 src/core/ft_cut.c:166
 msgid "Data conversion error"
 msgstr "Erro na conversão de dados"
  
@@ -823,7 +839,7 @@ msgstr &quot;Mostrar atualizações de janela&quot;
 msgid "Default"
 msgstr "Padrão"
  
-#: properties.c:425
+#: src/core/properties.c:452
 msgid "Default host URL"
 msgstr "URL parão para acesso ao host"
  
@@ -831,19 +847,19 @@ msgstr &quot;URL parão para acesso ao host&quot;
 msgid "Delete field"
 msgstr "Apagar campo"
  
-#: properties.c:439
+#: src/core/properties.c:466
 msgid "Description of the current security state"
 msgstr "Descrição do estado de segurança atual"
  
-#: telnet.c:1330
+#: src/core/telnet.c:1331
 msgid "Device type rejected"
 msgstr "Tipo de dispositivo rejeitado"
  
-#: ft.c:266
+#: src/core/ft.c:267
 msgid "Disconnected from host."
 msgstr "Desconectado do servidor."
  
-#: properties.c:397
+#: src/core/properties.c:424
 msgid "Display charset"
 msgstr "Tabela de caracteres para a tela"
  
@@ -851,11 +867,11 @@ msgstr &quot;Tabela de caracteres para a tela&quot;
 msgid "Display current charset"
 msgstr "Mostrar a tabela de caracteres ativa"
  
-#: toggles.c:94
+#: src/core/toggles.c:95
 msgid "Display the cursor location in the OIA (the status line)"
 msgstr "Mostra posição do cursor na lista de informações ao operador"
  
-#: telnet.c:879
+#: src/core/telnet.c:880
 msgid "EOR received when not in 3270 mode, ignored."
 msgstr "EOR recebido fora do modo 3270, ignorado."
  
@@ -863,15 +879,15 @@ msgstr &quot;EOR recebido fora do modo 3270, ignorado.&quot;
 msgid "ETA:"
 msgstr "ETA:"
  
-#: toggles.c:232
+#: src/core/toggles.c:233
 msgid "Enable SSL messages trace"
 msgstr "Habilitar trace SSL"
  
-#: toggles.c:226
+#: src/core/toggles.c:227
 msgid "Enable network in/out trace"
 msgstr "Habilitar trace de entrada/saída de rede"
  
-#: toggles.c:220
+#: src/core/toggles.c:221
 msgid "Enable network keep-alive with SO_KEEPALIVE"
 msgstr "Enable network keep-alive with SO_KEEPALIVE"
  
@@ -903,46 +919,42 @@ msgstr &quot;Apagar até o final do campo&quot;
 msgid "Erase to end of line"
 msgstr "Apagar até o final da linha"
  
-#: print.c:247 util.c:589 src/terminal/widget.c:160
+#: print.c:247 src/core/util.c:590 src/terminal/widget.c:159
 msgid "Error"
 msgstr "Erro"
  
-#: ft_dft.c:457 ft_cut.c:422
+#: src/core/ft_dft.c:452 src/core/ft_cut.c:423
 #, c-format
 msgid "Error \"%s\" reading from local file (rc=%d)"
 msgstr "Erro \"%s\" lendo arquivo local (rc=%d)"
  
-#: ft_dft.c:335 ft_cut.c:527
+#: src/core/ft_dft.c:330 src/core/ft_cut.c:528
 #, c-format
 msgid "Error \"%s\" writing to local file (rc=%d)"
 msgstr "Erro \"%s\" gravando arquivo local (rc=%d)"
  
-#: ftmessages.c:45
+#: src/core/ftmessages.c:45
 msgid "Error in file transfer: file transfer canceled"
 msgstr "Erro na transferência do arquivo, transferência cancelada"
  
-#: local/events.cc:59
-msgid "Error in vasprintf"
-msgstr "Erro na chamada vasprintf"
-
-#: dialog.c:393
+#: dialog.c:219
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro lendo %s"
  
-#: ssl/linux/getcrl.c:471 ssl/linux/getcrl.c:486
+#: src/ssl/linux/getcrl.c:485 src/ssl/linux/getcrl.c:501
 msgid "Error loading CRL"
 msgstr "Erro lendo CRL"
  
-#: ftmessages.c:87
+#: src/core/ftmessages.c:87
 msgid "Error reading file from host: file transfer canceled"
 msgstr "Erro ao ler arquivo do host: Transferência cancelada"
  
-#: ftmessages.c:145
+#: src/core/ftmessages.c:145
 msgid "Error while reading or writing to host disk: file transfer canceled"
 msgstr "Erro ao ler ou gravar no host: Transferência cancelada"
  
-#: ftmessages.c:80
+#: src/core/ftmessages.c:80
 msgid "Error writing file to host: file transfer canceled"
 msgstr "Erro ao gravar arquivo no host, transferência cancelada"
  
@@ -958,15 +970,19 @@ msgstr &quot;Delimitadores de campo&quot;
 msgid "Field colors"
 msgstr "Cor dos campos"
  
-#: ftmessages.c:52
+#: src/dialogs/save/save.c:270
+msgid "File _Format"
+msgstr "_Formato do arquivo"
+
+#: src/core/ftmessages.c:52
 msgid "File transfer complete"
 msgstr "Transferência completa"
  
-#: ftmessages.c:59
+#: src/core/ftmessages.c:59
 msgid "File transfer complete with records segmented"
 msgstr "Transferência completa com registros segmentados"
  
-#: ft.c:271
+#: src/core/ft.c:272
 msgid "File transfer is already active in this session."
 msgstr "Transferência de arquivos já está ativa nesta sessão."
  
@@ -995,27 +1011,31 @@ msgstr &quot;&quot;
 "Seguindo a convenção para arquivos texto ASCII, LF é usado para terminar "
 "registros no arquivo do PC."
  
-#: ssl/state.c:214
+#: src/terminal/properties.c:273
+msgid "Font family for terminal contents"
+msgstr "Familia da fonte usada no terminal"
+
+#: src/ssl/state.c:208
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erro de formato no campo \"lastUpdate\" do CRL"
  
-#: ssl/state.c:222
+#: src/ssl/state.c:216
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erro de formato no campo \"nextUpdate\" do CRL"
  
-#: ssl/state.c:206
+#: src/ssl/state.c:200
 msgid "Format error in certificate's notAfter field"
 msgstr "Erro de formato no campo \"notAfter\" do certificado"
  
-#: ssl/state.c:198
+#: src/ssl/state.c:192
 msgid "Format error in certificate's notBefore field"
 msgstr "Erro de formato no campo \"notBefore\" do certificado"
  
-#: properties.c:174
+#: src/core/properties.c:175
 msgid "Formatted screen"
 msgstr "Tela formatada"
  
-#: toggles.c:147 00default.xml:118
+#: src/core/toggles.c:148 00default.xml:118
 msgid "Full Screen"
 msgstr "Tela cheia"
  
@@ -1031,7 +1051,7 @@ msgstr &quot;Caminho completo do arquivo remoto&quot;
 msgid "Function bar"
 msgstr "Barra de funções"
  
-#: main.c:104 main.c:489
+#: main.c:92 main.c:422
 msgid "GTK Version mismatch"
 msgstr "Divergência de versão GTK"
  
@@ -1043,11 +1063,11 @@ msgstr &quot;Obtém a fila de transferência de um arquivo XML externo&quot;
 msgid "Get transfer queue from file"
 msgstr "Obtêm a fila de arquivos a transferir de um arquivo"
  
-#: ssl/linux/getcrl.c:528
-msgid "Got an invalid CRL from LDAP server"
-msgstr "Obtive um certificado inválido do servidor LDAP"
+#: src/ssl/linux/getcrl.c:546
+msgid "Got a bad formatted CRL from LDAP server"
+msgstr "Obtive um certificado com formato inválido do servidor LDAP"
  
-#: ssl/linux/getcrl.c:506 ssl/linux/getcrl.c:515 ssl/linux/getcrl.c:545
+#: src/ssl/linux/getcrl.c:532
 msgid "Got an invalid CRL from server"
 msgstr "Obtive um CRL inválido do servidor"
  
@@ -1059,7 +1079,7 @@ msgstr &quot;Cinza&quot;
 msgid "Green"
 msgstr "Verde"
  
-#: properties.c:160
+#: src/core/properties.c:161
 msgid "Has selected area"
 msgstr "Tem área selecionada"
  
@@ -1067,55 +1087,59 @@ msgstr &quot;Tem área selecionada&quot;
 msgid "Help"
 msgstr "Ajuda"
  
-#: properties.c:390
+#: src/core/properties.c:417
 msgid "Host charset"
 msgstr "Página de código do host"
  
-#: ft.c:685
+#: src/core/ft.c:686
 msgid "Host disconnected, transfer cancelled"
 msgstr "Servidor desconectou, transferência cancelada"
  
-#: telnet.c:1388
+#: src/core/telnet.c:1389
 msgid "Host illegally added function(s)"
 msgstr "Host illegally added function(s)"
  
-#: ftmessages.c:222
+#: src/core/ftmessages.c:222
 msgid "Host program error code xxxxxxxxxx: file transfer canceled"
 msgstr "Erro código xxxxxxxxxx no aplicativo do host: Transferência cancelada"
  
-#: telnet.c:1313
+#: src/core/telnet.c:1314
 msgid "Host rejected device type or request type"
 msgstr "Servidor rejeitou o tipo de dispositivo ou requisição"
  
-#: telnet.c:1326
+#: src/core/telnet.c:1327
 msgid "Host rejected resource(s)"
 msgstr "Servidor rejeitou recurso(s)"
  
-#: main.c:367
+#: main.c:303
 msgid "Host system type"
 msgstr "Tipo do sistema no servidor"
  
-#: main.c:365
+#: main.c:301
 msgid "Host to connect"
 msgstr "Servidor a conectar"
  
-#: properties.c:383
+#: src/core/properties.c:410
 msgid "Host type name"
 msgstr "Nome do tipo de host"
  
-#: options.c:49
+#: src/dialogs/save/save.c:59
+msgid "HyperText Markup Language (HTML)"
+msgstr "Documento HTML"
+
+#: src/core/options.c:49
 msgid "IBM AS/400"
 msgstr "IBM AS/400"
  
-#: options.c:43
+#: src/core/options.c:43
 msgid "IBM S/390"
 msgstr "IBM S/390"
  
-#: toggles.c:148
+#: src/core/toggles.c:149
 msgid "If set, asks to place the toplevel window in the fullscreen state"
 msgstr "If set, asks to place the toplevel window in the fullscreen state"
  
-#: toggles.c:130
+#: src/core/toggles.c:131
 msgid ""
 "If set, puts restrictions on how pasted text is placed on the screen. The "
 "position of the cursor at the time the paste operation is begun is used as a "
@@ -1129,15 +1153,15 @@ msgstr &quot;&quot;
 "that position. This option is useful for pasting into certain IBM editors "
 "that use the left side of the screen for control information"
  
-#: toggles.c:82
+#: src/core/toggles.c:83
 msgid "If set, the cursor blinks"
 msgstr "Se ativo o cursor pisca"
  
-#: toggles.c:76
+#: src/core/toggles.c:77
 msgid "If set, the terminal operates in uppercase-only mode"
 msgstr "Se ativo o terminal opera apenas com caracteres maiúsculos"
  
-#: toggles.c:136
+#: src/core/toggles.c:137
 msgid ""
 "If set, the terminal will always select rectangular areas of the screen. "
 "Otherwise, it selects continuous regions of the screen"
@@ -1145,7 +1169,7 @@ msgstr &quot;&quot;
 "Se ativo o terminal sempre selecionará áreas retangulares, se inativo "
 "selecionará áreas contínuas da tela"
  
-#: toggles.c:142
+#: src/core/toggles.c:143
 msgid ""
 "If set, the terminal will display a crosshair over the cursor: lines "
 "extending the full width and height of the screen, centered over the cursor "
@@ -1155,7 +1179,7 @@ msgstr &quot;&quot;
 "extending the full width and height of the screen, centered over the cursor "
 "position. This makes locating the cursor on the screen much easier"
  
-#: toggles.c:88
+#: src/core/toggles.c:89
 msgid ""
 "If set, the time taken by the host to process an AID is displayed on the "
 "status line"
@@ -1171,15 +1195,15 @@ msgstr &quot;Ignore&quot;
 msgid "Ignore the fail and remove the file from queue."
 msgstr "Ignore the fail and remove the file from queue."
  
-#: ft_cut.c:504
+#: src/core/ft_cut.c:505
 msgid "Illegal frame length"
 msgstr "Comprimento de frame inválido"
  
-#: ftmessages.c:138
+#: src/core/ftmessages.c:138
 msgid "Incorrect option specified: file transfer canceled"
 msgstr "Opção incorreta, transferência cancelada"
  
-#: ftmessages.c:101
+#: src/core/ftmessages.c:101
 msgid "Incorrect request code: file transfer canceled"
 msgstr "Código de requisição incorreto, transferência cancelada"
  
@@ -1199,11 +1223,11 @@ msgstr &quot;Intensificado/Protegido&quot;
 msgid "Intensified/Unprotected"
 msgstr "Intensificado/Desprotegido"
  
-#: ssl/state.c:285
+#: src/ssl/state.c:279
 msgid "Invalid CA certificate"
 msgstr "Certificado CA inválido"
  
-#: local/session.cc:69 src/terminal/callbacks.c:429
+#: src/terminal/callbacks.c:495
 msgid "Invalid callback table, possible version mismatch in lib3270"
 msgstr ""
 "Tabela de callbacks inválida, possível divergência de versão na lib3270"
@@ -1216,23 +1240,23 @@ msgstr &quot;Valor cgcsgid é inválido&quot;
 msgid "Invalid character value"
 msgstr "Valor de caractere inválido"
  
-#: ftmessages.c:166
+#: src/core/ftmessages.c:166
 msgid "Invalid option xxxxxxxx with APPEND: file transfer canceled"
 msgstr "Opção xxxxxxxx não e valida com APPEND: Transferência cancelada"
  
-#: ftmessages.c:180
+#: src/core/ftmessages.c:180
 msgid "Invalid option xxxxxxxx with PDS: file transfer canceled"
 msgstr "Opção xxxxxxxx inválida com PDS: Transferência cancelada"
  
-#: ftmessages.c:159
+#: src/core/ftmessages.c:159
 msgid "Invalid option xxxxxxxx with RECEIVE: file transfer canceled"
 msgstr "Opção xxxxxxxx inválida com RECEIVE: Transferência cancelada"
  
-#: ftmessages.c:173
+#: src/core/ftmessages.c:173
 msgid "Invalid option xxxxxxxx without SPACE: file transfer canceled"
 msgstr "Opção xxxxxxxx inválida sem SPACE: Transferência cancelada"
  
-#: ftmessages.c:152
+#: src/core/ftmessages.c:152
 msgid "Invalid option xxxxxxxx: file transfer canceled"
 msgstr "Opção xxxxxxxx inválida: Transferência cancelada"
  
@@ -1240,43 +1264,39 @@ msgstr &quot;Opção xxxxxxxx inválida: Transferência cancelada&quot;
 msgid "Invalid remap scope"
 msgstr "Escopo de mapeamento inválido"
  
-#: local/events.cc:88 local/events.cc:141
-msgid "Invalid session handler"
-msgstr "Identificador de sessão é inválido"
-
 #: src/dialogs/security.c:181
 msgid "Invalid state"
 msgstr "Estado inválido"
  
-#: properties.c:83
+#: src/core/properties.c:84
 msgid "Is connection secure"
 msgstr "A conexão é segura ?"
  
-#: properties.c:167
+#: src/core/properties.c:168
 msgid "Is starting (no first screen)?"
 msgstr "Está iniciando (não recebeu a primeira tela)?"
  
-#: properties.c:76
+#: src/core/properties.c:77
 msgid "Is terminal connected"
 msgstr "O terminal está conectado"
  
-#: properties.c:153
+#: src/core/properties.c:154
 msgid "Is terminal in the INITIAL_E state?"
 msgstr "O terminal está no estad INITIAL_E?"
  
-#: properties.c:69
+#: src/core/properties.c:70
 msgid "Is terminal ready"
 msgstr "O terminal está pronto"
  
-#: toggles.c:177 00default.xml:127
+#: src/core/toggles.c:178 00default.xml:127
 msgid "Keep selected"
 msgstr "Manter selecionado"
  
-#: ssl/state.c:349
+#: src/ssl/state.c:343
 msgid "Key usage does not include certificate signing"
 msgstr "Uso da chave não permite assinatura de certificados"
  
-#: paste.c:337
+#: src/core/paste.c:342
 msgid "Keyboard is locked"
 msgstr "Teclado está bloqueado"
  
@@ -1284,7 +1304,7 @@ msgstr &quot;Teclado está bloqueado&quot;
 msgid "Lateral keypad"
 msgstr "Barra lateral"
  
-#: properties.c:256
+#: src/core/properties.c:290
 msgid "Latest program message"
 msgstr "Última mensagem de programa"
  
@@ -1309,11 +1329,7 @@ msgstr &quot;Arquivo local:&quot;
 msgid "Local:"
 msgstr "Local:"
  
-#: main.c:386
-msgid "Log to file"
-msgstr "Enviar log para arquivo"
-
-#: main.c:373
+#: main.c:309
 msgid "Minutes for auto-disconnect"
 msgstr "Minutos para desconexão automática"
  
@@ -1326,11 +1342,11 @@ msgstr &quot;Cores diversas&quot;
 msgid "Model %d (%s)"
 msgstr "Modelo %d (%s)"
  
-#: properties.c:376
+#: src/core/properties.c:403
 msgid "Model name"
 msgstr "Nome do modelo"
  
-#: toggles.c:75 00default.xml:116
+#: src/core/toggles.c:76 00default.xml:116
 msgid "Monocase"
 msgstr "Só Maiúsculas"
  
@@ -1338,7 +1354,7 @@ msgstr &quot;Só Maiúsculas&quot;
 msgid "Monochrome"
 msgstr "Monocromático"
  
-#: actions.c:718
+#: actions.c:689
 msgid "Move action needs target & direction attributes"
 msgstr "Ação \"move\" precisa dos atributos \"target\" e \"direction\""
  
@@ -1346,11 +1362,12 @@ msgstr &quot;Ação \&quot;move\&quot; precisa dos atributos \&quot;target\&quot; e \&quot;direction\&quot;&quot;
 msgid "Mustard"
 msgstr "Mostarda"
  
-#: telnet.c:354 linux/event_dispatcher.c:144 linux/connect.c:78
+#: src/core/telnet.c:355 src/core/linux/event_dispatcher.c:143
+#: src/core/linux/connect.c:80
 msgid "Network error"
 msgstr "Erro de rede"
  
-#: toggles.c:219 00default.xml:131
+#: src/core/toggles.c:220 00default.xml:131
 msgid "Network keep alive"
 msgstr "Network keep alive"
  
@@ -1358,11 +1375,11 @@ msgstr &quot;Network keep alive&quot;
 msgid "Next field"
 msgstr "Próximo campo"
  
-#: ssl/linux/getcrl.c:288
+#: src/ssl/linux/getcrl.c:300
 msgid "No DN of the entry at which to start the search on the URL"
 msgstr "URL de pesquisa não contem o DN a pesquisar"
  
-#: ssl/linux/getcrl.c:300
+#: src/ssl/linux/getcrl.c:312
 msgid "No LDAP attribute on the URL"
 msgstr "URL de pesquisa não definiu o atributo LDAP"
  
@@ -1370,7 +1387,7 @@ msgstr &quot;URL de pesquisa não definiu o atributo LDAP&quot;
 msgid "No active transfer"
 msgstr "Nenhuma transferência ativa"
  
-#: ssl/state.c:270
+#: src/ssl/state.c:264
 msgid ""
 "No signatures could be verified because the chain contains only one "
 "certificate and it is not self signed."
@@ -1382,15 +1399,15 @@ msgstr &quot;&quot;
 msgid "No transfer"
 msgstr "Nenhuma transferência"
  
-#: ft.c:100 src/filetransfer/worker.c:602
+#: src/core/ft.c:101 src/filetransfer/worker.c:602
 msgid "No transfer in progress"
 msgstr "Nenhuma transferência em andamento"
  
-#: properties.c:97
+#: src/core/properties.c:98
 msgid "Non zero if the host is AS400."
 msgstr "Diferente de zero se o host é AS400"
  
-#: properties.c:90
+#: src/core/properties.c:91
 msgid "Non zero if the host is TSO."
 msgstr "Diferente de zero se o host é TSO"
  
@@ -1402,10 +1419,14 @@ msgstr &quot;Normal/Protegido&quot;
 msgid "Normal/Unprotected"
 msgstr "Normal/Desprotegido"
  
-#: ft.c:692
+#: src/core/ft.c:693
 msgid "Not in 3270 mode, transfer cancelled"
 msgstr "Não está no modo 3270, transferência cancelada"
  
+#: src/selection/linux/paste.c:74
+msgid "Not the same terminal type"
+msgstr "O tipo de terminal é diferente"
+
 #: colors.c:526 src/dialogs/colors.c:322
 msgid "OIA Warning"
 msgstr "Alerta na OIA"
@@ -1430,7 +1451,7 @@ msgstr &quot;Estado inválido na OIA&quot;
 msgid "OIA status ok"
 msgstr "Estado normal na OIA"
  
-#: ftmessages.c:187
+#: src/core/ftmessages.c:187
 msgid "Only one of TRACKS, CYLINDERS, AVBLOCK allowed: file transfer canceled"
 msgstr ""
 "Permitida apenas uma opção dentre TRACKS, CYLINDERS, AVBLOCK: Transferência "
@@ -1438,7 +1459,8 @@ msgstr &quot;&quot;
  
 #: src/terminal/callbacks.c:343 src/filetransfer/save.c:118
 #: src/filetransfer/load.c:272 src/filetransfer/activitylist.c:440
-#: src/dialogs/transfer.c:99
+#: src/dialogs/transfer.c:99 src/dialogs/save/save.c:498
+#: src/dialogs/save/convenience.c:65 src/dialogs/save/convenience.c:94
 msgid "Operation has failed"
 msgstr "Operação falhou"
  
@@ -1450,22 +1472,18 @@ msgstr &quot;Opções&quot;
 msgid "Orange"
 msgstr "Laranja"
  
-#: options.c:55
+#: src/core/options.c:55
 msgid "Other (TSO)"
 msgstr "Outro (TSO)"
  
-#: options.c:61
+#: src/core/options.c:61
 msgid "Other (VM/CMS)"
 msgstr "Outro (VM/CMS)"
  
-#: ssl/state.c:230
+#: src/ssl/state.c:224
 msgid "Out of memory"
 msgstr "Memória insuficiente"
  
-#: local/events.cc:71
-msgid "Out of memory in vasprintf"
-msgstr "Memória insuficiente em vasprintf"
-
 #: 10keypad.xml:68
 msgid "PA1"
 msgstr "PA1"
@@ -1574,7 +1592,7 @@ msgstr &quot;PF8&quot;
 msgid "PF9"
 msgstr "PF9"
  
-#: main.c:409
+#: main.c:339
 msgid "Parse error"
 msgstr "Erro de interpretação"
  
@@ -1595,11 +1613,11 @@ msgstr &quot;Colar próximo&quot;
 msgid "Paste text file"
 msgstr "Colar arquivo texto"
  
-#: dialog.c:433
+#: dialog.c:259
 msgid "Paste text file contents"
 msgstr "Colar conteúdo de arquivo texto"
  
-#: toggles.c:129 00default.xml:120
+#: src/core/toggles.c:130 00default.xml:120
 msgid "Paste with left margin"
 msgstr "Colar com margem esquerda"
  
@@ -1607,11 +1625,11 @@ msgstr &quot;Colar com margem esquerda&quot;
 msgid "Path and name of the local file"
 msgstr "Caminho e nome do arquivo local"
  
-#: main.c:374
+#: main.c:310
 msgid "Path for plugin files"
 msgstr "Caminho para os arquivos de plugin"
  
-#: ssl/state.c:293
+#: src/ssl/state.c:287
 msgid "Path length constraint exceeded"
 msgstr "Path length constraint exceeded"
  
@@ -1619,7 +1637,7 @@ msgstr &quot;Path length constraint exceeded&quot;
 msgid "Peer certificate"
 msgstr "Certificado apresentado"
  
-#: ftmessages.c:66
+#: src/core/ftmessages.c:66
 msgid "Personal computer filespec incorrect: file transfer canceled"
 msgstr "Especificação de arquivo PC incorreta: Transferência cancelada"
  
@@ -1627,6 +1645,10 @@ msgstr &quot;Especificação de arquivo PC incorreta: Transferência cancelada&quot;
 msgid "Pink"
 msgstr "Rosa"
  
+#: src/dialogs/save/save.c:51
+msgid "Plain text"
+msgstr "Texto puro"
+
 #: src/dialogs/hostselect.c:140
 msgid "Port or service name (empty for \"telnet\")."
 msgstr "Nº da porta ou nome do serviço (em branco para \"telnet\")."
@@ -1652,9 +1674,8 @@ msgstr &quot;&quot;
 "The units are given by the space allocation units option."
  
 #: src/filetransfer/tables.c:178
-#, fuzzy
 msgid "Primary space"
-msgstr "Primary space:"
+msgstr "Primary space"
  
 #: 00default.xml:47
 msgid "Print"
@@ -1692,79 +1713,79 @@ msgstr &quot;Púrpura&quot;
 msgid "Quit"
 msgstr "Sair"
  
-#: rpq.c:234
+#: src/core/rpq.c:236
 #, c-format
 msgid "RPQ %s term omitted due to insufficient space"
 msgstr "Termo RPQ %s omitido por falta de espaço"
  
-#: rpq.c:346
+#: src/core/rpq.c:348
 #, c-format
 msgid "RPQ %s term override ignored"
 msgstr "RPQ %s term override ignored"
  
-#: rpq.c:637 rpq.c:707
+#: src/core/rpq.c:639 src/core/rpq.c:709
 #, c-format
 msgid "RPQ ADDRESS term has unrecognized family %u"
 msgstr "Família %u não reconhecida no termo RPQ ADDRESS"
  
-#: rpq.c:645 rpq.c:674 rpq.c:714
+#: src/core/rpq.c:647 src/core/rpq.c:676 src/core/rpq.c:716
 msgid "RPQ ADDRESS term incomplete due to space limit"
 msgstr "Termo RPQ ADDRESS incompleto devido ao limite de espaço"
  
-#: rpq.c:227
+#: src/core/rpq.c:229
 msgid "RPQ Error"
 msgstr "Erro RPQ"
  
-#: rpq.c:414 rpq.c:423
+#: src/core/rpq.c:416 src/core/rpq.c:425
 msgid "RPQ TIMEZONE term is invalid - use +/-hhmm"
 msgstr "Termo RPQ TIMEZONE é invalido - usar +/-hhmm"
  
-#: rpq.c:514
+#: src/core/rpq.c:516
 msgid "RPQ USER term has non-hex character"
 msgstr "Termo RPQ USER tem caractere não hexadecimal"
  
-#: rpq.c:539
+#: src/core/rpq.c:541
 msgid "RPQ USER term has odd number of hex digits"
 msgstr "RPQ USER term has odd number of hex digits"
  
-#: rpq.c:520
+#: src/core/rpq.c:522
 #, c-format
 msgid "RPQ USER term truncated after %d bytes"
 msgstr "Termo RPQ USER truncado depois de %d bytes"
  
-#: rpq.c:564
+#: src/core/rpq.c:566
 #, c-format
 msgid "RPQ USER term truncated after %d characters"
 msgstr "Termo RPQ USER truncado depois de %d caracteres"
  
-#: rpq.c:358
+#: src/core/rpq.c:360
 #, c-format
 msgid "RPQ term \"%s\" is unrecognized"
 msgstr "Termo RPQ desconhecido: \"%s\" "
  
-#: rpq.c:229
+#: src/core/rpq.c:231
 #, c-format
 msgid "RPQ term %d is unknown"
 msgstr "Termo RPM %d não foi reconhecido"
  
-#: rpq.c:458
+#: src/core/rpq.c:460
 msgid "RPQ timezone exceeds 12 hour UTC offset"
 msgstr "RPQ timezone excede as 12 horas de deslocamento da UTC"
  
-#: rpq.c:443
+#: src/core/rpq.c:445
 msgid "RPQ: Unable to determine workstation UTC time"
 msgstr "RPQ: Incapaz de determinar a hora UTC da estação de trabalho"
  
-#: rpq.c:436
+#: src/core/rpq.c:438
 msgid "RPQ: Unable to determine workstation local time"
 msgstr "RPQ: Incapaz de determinar a hora local da estação de trabalho"
  
-#: rpq.c:650
+#: src/core/rpq.c:652
 #, c-format
 msgid "RPQ: can't resolve '%s': %s"
 msgstr "RPQ: Não foi possível resolver '%s': %s"
  
-#: rpq.c:663
+#: src/core/rpq.c:665
 msgid "RPQ: gethostbyname error"
 msgstr "RPQ: Erro em gethostbyname"
  
@@ -1804,7 +1825,7 @@ msgstr &quot;Recarregar conteúdo do buffer&quot;
 msgid "Remap Failed"
 msgstr "Remapeamento falhou"
  
-#: main.c:371
+#: main.c:307
 msgid "Remap charset from xml file"
 msgstr "Remapear caracteres por um arquivo xml"
  
@@ -1833,11 +1854,11 @@ msgstr &quot;Remove arquivo selecionado da fila de transferência&quot;
 msgid "Remove selection"
 msgstr "Remover seleção"
  
-#: ft.c:208
+#: src/core/ft.c:209
 msgid "Request failed"
 msgstr "Requisição falhou"
  
-#: ftmessages.c:94
+#: src/core/ftmessages.c:94
 msgid "Required host storage unavailable: file transfer canceled"
 msgstr "Armazenamento necessário indisponível: Transferência cancelada"
  
@@ -1849,7 +1870,7 @@ msgstr &quot;Reselecionar&quot;
 msgid "Reset"
 msgstr "Reset"
  
-#: toggles.c:213 00default.xml:119
+#: src/core/toggles.c:214 00default.xml:119
 msgid "Resize on alternate screen"
 msgstr "Mudar tamanho do terminal em tela alternativa"
  
@@ -1865,7 +1886,7 @@ msgstr &quot;Return&quot;
 msgid "Revocation list"
 msgstr "Lista de revogados"
  
-#: ftmessages.c:188 src/filetransfer/v3270ftprogress.c:186
+#: src/core/ftmessages.c:188 src/filetransfer/v3270ftprogress.c:186
 msgid ""
 "SPACE can be specified in units of TRACKS, CYLINDERS, or AVBLOCK, and only "
 "one option can be used."
@@ -1873,28 +1894,23 @@ msgstr &quot;&quot;
 "SPACE can be specified in units of TRACKS, CYLINDERS, or AVBLOCK, and only "
 "one option can be used."
  
-#: ssl/negotiate.c:154
+#: src/ssl/negotiate.c:157
 msgid "SSL Connect failed"
 msgstr "Conexão SSL falhou"
  
-#: telnet.c:666
+#: src/core/telnet.c:667
 msgid "SSL Error"
 msgstr "Erro SSL"
  
-#: telnet.c:666
+#: src/core/telnet.c:667
 msgid "SSL Read error"
 msgstr "Erro de leitura SSL"
  
-#: ssl/negotiate.c:175 ssl/negotiate.c:184 ssl/negotiate.c:193
-#: ssl/negotiate.c:209 ssl/negotiate.c:222
-msgid "SSL error"
-msgstr "Erro SSL"
-
-#: ssl/negotiate.c:131
+#: src/ssl/negotiate.c:134
 msgid "SSL negotiation failed"
 msgstr "Negociação SSL falhou"
  
-#: telnet.c:1645
+#: src/core/telnet.c:1646
 #, c-format
 msgid ""
 "SSL_write:\n"
@@ -1904,22 +1920,23 @@ msgstr &quot;&quot;
 "%s"
  
 #: src/filetransfer/v3270ft.c:217 src/filetransfer/activitylist.c:460
-#: src/trace/widget.c:519 src/dialogs/transfer.c:72
+#: src/trace/widget.c:521 src/dialogs/transfer.c:72
 msgid "Save"
 msgstr "Salvar"
  
-#: src/trace/widget.c:448
+#: src/trace/widget.c:450
 msgid "Save _As"
 msgstr "Salvar _Como"
  
+#: src/dialogs/save/save.c:342
+#, fuzzy
+msgid "Save copied data"
+msgstr "Salvar cópia"
+
 #: 00default.xml:44
 msgid "Save copy"
 msgstr "Salvar cópia"
  
-#: dialog.c:370
-msgid "Save copy to file"
-msgstr "Salvar cópia para arquivo"
-
 #: src/filetransfer/v3270ft.c:216 src/filetransfer/activitylist.c:459
 msgid "Save queue to file"
 msgstr "Salvar a fila para um arquivo"
@@ -1928,19 +1945,19 @@ msgstr &quot;Salvar a fila para um arquivo&quot;
 msgid "Save screen"
 msgstr "Salvar tela"
  
-#: dialog.c:335
-msgid "Save screen to file"
-msgstr "Salvar tela para arquivo"
-
 #: 00default.xml:43
 msgid "Save selected"
 msgstr "Salvar seleção"
  
-#: dialog.c:353
-msgid "Save selection to file"
-msgstr "Salvar seleção para arquivo"
+#: src/dialogs/save/save.c:341
+msgid "Save selected area"
+msgstr "Salvar área selecionada"
+
+#: src/dialogs/save/save.c:340
+msgid "Save terminal contents"
+msgstr "Salvar conteúdo da tela"
  
-#: src/trace/widget.c:518
+#: src/trace/widget.c:520
 msgid "Save trace to file"
 msgstr "Salvar trace para arquivo"
  
@@ -1964,12 +1981,12 @@ msgstr &quot;Guarda fila de transferência num arquivo XML externo&quot;
 msgid "Save transfer queue to file"
 msgstr "Salvar fila de transferências para arquivo"
  
-#: config.c:570
+#: config.c:568
 #, c-format
 msgid "Saving %s"
 msgstr "Gravando %s"
  
-#: properties.c:242
+#: src/core/properties.c:230
 msgid "Screen buffer length in bytes"
 msgstr "Tamanho do buffer de tela em bytes"
  
@@ -1981,11 +1998,11 @@ msgstr &quot;Tamanho da tela&quot;
 msgid "Scripts"
 msgstr "Scripts"
  
-#: ssl/linux/getcrl.c:379
+#: src/ssl/linux/getcrl.c:391
 msgid "Search did not produce any attributes."
 msgstr "Pesquisa não produziu nenhum atributo"
  
-#: ssl/linux/getcrl.c:390
+#: src/ssl/linux/getcrl.c:403
 msgid "Search did not produce any values."
 msgstr "Pesquisa não produziu nenhum valor"
  
@@ -1998,26 +2015,34 @@ msgstr &quot;&quot;
 "The units are given by the space allocation units option."
  
 #: src/filetransfer/tables.c:186
-#, fuzzy
 msgid "Secondary space"
-msgstr "Secondary space:"
+msgstr "Secondary space"
  
-#: ssl/state.c:98
+#: src/ssl/state.c:92
 msgid "Secure connection was successful."
 msgstr "Conexão segura efetuada com sucesso."
  
-#: ssl/negotiate.c:101 ssl/negotiate.c:130 ssl/negotiate.c:153
-#: ssl/ctx_init.c:202 ssl/ctx_init.c:229 ssl/linux/getcrl.c:246
-#: ssl/linux/getcrl.c:264 ssl/linux/getcrl.c:287 ssl/linux/getcrl.c:299
-#: ssl/linux/getcrl.c:319 ssl/linux/getcrl.c:330 ssl/linux/getcrl.c:341
-#: ssl/linux/getcrl.c:366 ssl/linux/getcrl.c:377 ssl/linux/getcrl.c:388
-#: ssl/linux/getcrl.c:411 ssl/linux/getcrl.c:462 ssl/linux/getcrl.c:485
-#: ssl/linux/getcrl.c:505 ssl/linux/getcrl.c:514 ssl/linux/getcrl.c:527
-#: ssl/linux/getcrl.c:544 ssl/linux/getcrl.c:558
+#: src/ssl/negotiate.c:104 src/ssl/negotiate.c:133 src/ssl/negotiate.c:156
+#: src/ssl/negotiate.c:176 src/ssl/negotiate.c:199 src/ssl/negotiate.c:218
+#: src/ssl/ctx_init.c:124 src/ssl/ctx_init.c:151 src/ssl/linux/getcrl.c:248
+#: src/ssl/linux/getcrl.c:267 src/ssl/linux/getcrl.c:279
+#: src/ssl/linux/getcrl.c:299 src/ssl/linux/getcrl.c:311
+#: src/ssl/linux/getcrl.c:331 src/ssl/linux/getcrl.c:342
+#: src/ssl/linux/getcrl.c:353 src/ssl/linux/getcrl.c:378
+#: src/ssl/linux/getcrl.c:389 src/ssl/linux/getcrl.c:401
+#: src/ssl/linux/getcrl.c:425 src/ssl/linux/getcrl.c:476
+#: src/ssl/linux/getcrl.c:500 src/ssl/linux/getcrl.c:522
+#: src/ssl/linux/getcrl.c:531 src/ssl/linux/getcrl.c:545
+#: src/ssl/linux/getcrl.c:575 src/ssl/linux/getcrl.c:590
 msgid "Security error"
 msgstr "Erro de segurança"
  
+#: src/ssl/negotiate.c:222
+msgid "Security warning"
+msgstr "Alerta de segurança"
+
 #: src/filetransfer/v3270ft.c:307 src/filetransfer/settings.c:209
+#: src/dialogs/save/save.c:126 src/dialogs/save/save.c:151
 msgid "Select"
 msgstr "Selecionar"
  
@@ -2029,11 +2054,16 @@ msgstr &quot;Selecionar campo&quot;
 msgid "Select all"
 msgstr "Selecionar tudo"
  
-#: toggles.c:135 00default.xml:123
+#: src/core/toggles.c:136 00default.xml:123
 msgid "Select by rectangles"
 msgstr "Seleção retangular"
  
+#: src/dialogs/save/save.c:125 src/dialogs/save/save.c:147
+msgid "Select destination file"
+msgstr "Selecionar arquivo destino"
+
 #: src/filetransfer/v3270ft.c:577 src/filetransfer/settings.c:470
+#: src/dialogs/save/save.c:216
 msgid "Select file"
 msgstr "Selecionar arquivo"
  
@@ -2061,7 +2091,7 @@ msgstr &quot;Selecionar próximo arquivo&quot;
 msgid "Select previous file"
 msgstr "Selecionar arquivo anterior"
  
-#: linux/event_dispatcher.c:145
+#: src/core/linux/event_dispatcher.c:144
 msgid "Select() failed when processing for events."
 msgstr "Select() falhou ao processar eventos."
  
@@ -2073,11 +2103,11 @@ msgstr &quot;Fundo da seleção&quot;
 msgid "Selection foreground"
 msgstr "Frente da seleção"
  
-#: ssl/state.c:238
+#: src/ssl/state.c:232
 msgid "Self signed certificate"
 msgstr "Certificado auto assinado"
  
-#: ssl/state.c:252
+#: src/ssl/state.c:246
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado auto assinado na cadeia de certificados"
  
@@ -2085,10 +2115,6 @@ msgstr &quot;Certificado auto assinado na cadeia de certificados&quot;
 msgid "Send file"
 msgstr "Enviar arquivo"
  
-#: main.c:383
-msgid "Send messages to syslog"
-msgstr "Enviar mensagens para o log do sistema"
-
 #: src/filetransfer/tables.c:142
 msgid "Send text file"
 msgstr "Enviar arquivo texto"
@@ -2101,31 +2127,31 @@ msgstr &quot;Enviar/Receber&quot;
 msgid "Sending file"
 msgstr "Enviando arquivo"
  
-#: main.c:360 main.c:362
+#: main.c:296 main.c:298
 msgid "Session name"
 msgstr "Nome da sessão"
  
-#: main.c:370
+#: main.c:306
 msgid "Set host charset"
 msgstr "Define página de código do host"
  
-#: toggles.c:159
+#: src/core/toggles.c:160
 msgid "Set insert mode"
 msgstr "Set insert mode"
  
-#: main.c:366
+#: main.c:302
 msgid "Set reported colors (8/16)"
 msgstr "Define número de cores informadas (8/16)"
  
-#: main.c:369
+#: main.c:305
 msgid "Set toggles OFF"
 msgstr "Desativa toggles"
  
-#: main.c:368
+#: main.c:304
 msgid "Set toggles ON"
 msgstr "Ativa toggles"
  
-#: main.c:385
+#: main.c:318
 msgid "Set trace filename"
 msgstr "Define o nome do arquivo de trace"
  
@@ -2137,11 +2163,11 @@ msgstr &quot;Configurações&quot;
 msgid "Setup host"
 msgstr "Configurar host"
  
-#: toggles.c:207
+#: src/core/toggles.c:208
 msgid "Show Field attribute"
 msgstr "Mostrar atributos de campo"
  
-#: toggles.c:183 00default.xml:126
+#: src/core/toggles.c:184 00default.xml:126
 msgid "Show Underline"
 msgstr "Mostrar sublinhado"
  
@@ -2149,7 +2175,7 @@ msgstr &quot;Mostrar sublinhado&quot;
 msgid "Show test pattern"
 msgstr "Mostrar padrão de teste"
  
-#: toggles.c:87
+#: src/core/toggles.c:88
 msgid "Show timer when processing"
 msgstr "Show timer when processing"
  
@@ -2161,19 +2187,19 @@ msgstr &quot;Skip&quot;
 msgid "Skip this transfer, keep the file on queue."
 msgstr "Skip this transfer, keep the file on queue."
  
-#: toggles.c:165 00default.xml:128
+#: src/core/toggles.c:166 00default.xml:128
 msgid "Smart paste"
 msgstr "Colar inteligente"
  
-#: iocalls.c:561 iocalls.c:578
+#: src/core/iocalls.c:564 src/core/iocalls.c:581
 msgid "Socket error"
 msgstr "Erro no socket"
  
-#: telnet.c:692
+#: src/core/telnet.c:693
 msgid "Socket read error"
 msgstr "Erro ao ler dados da rede"
  
-#: telnet.c:1666
+#: src/core/telnet.c:1667
 msgid "Socket write error"
 msgstr "Erro ao enviar dados para a rede"
  
@@ -2241,11 +2267,11 @@ msgstr &quot;Iniciando&quot;
 msgid "Starting transfer"
 msgstr "Iniciando transferência"
  
-#: properties.c:132
+#: src/core/properties.c:133
 msgid "State is 3270, TN3270e or SSCP"
 msgstr "Estado do terminal é 3270, TN3270e or SSCP"
  
-#: ssl/state.c:325
+#: src/ssl/state.c:319
 msgid "Subject issuer mismatch"
 msgstr "Divergência na identidade do emissor"
  
@@ -2253,15 +2279,19 @@ msgstr &quot;Divergência na identidade do emissor&quot;
 msgid "System _type"
 msgstr "_Tipo de servidor"
  
-#: telnet.c:1154
+#: src/core/telnet.c:1155
 msgid "TLS negotiation failure"
 msgstr "Negociação TLS falhou"
  
+#: src/terminal/properties.c:288
+msgid "TN3270 Session name"
+msgstr "Nome da sessão TN3270"
+
 #: colors.c:487 src/dialogs/colors.c:206 src/dialogs/colors.c:283
 msgid "Terminal colors"
 msgstr "Cores do terminal"
  
-#: src/trace/widget.c:522
+#: src/trace/widget.c:524
 msgid "Text file"
 msgstr "Arquivo texto"
  
@@ -2269,7 +2299,7 @@ msgstr &quot;Arquivo texto&quot;
 msgid "Text files"
 msgstr "Arquivos de texto"
  
-#: ftmessages.c:216 src/filetransfer/v3270ftprogress.c:210
+#: src/core/ftmessages.c:216 src/filetransfer/v3270ftprogress.c:210
 msgid ""
 "The CMS disk is full, or the maximum number of files on the minidisk (3400) "
 "has been reached, or the maximum number of data blocks per file (16060) has "
@@ -2279,23 +2309,23 @@ msgstr &quot;&quot;
 "has been reached, or the maximum number of data blocks per file (16060) has "
 "been reached."
  
-#: ssl/state.c:190 ssl/negotiate.c:194
+#: src/ssl/state.c:184
 msgid "The CRL has expired."
 msgstr "A lista de certificados revogados expirou."
  
-#: ssl/state.c:178 ssl/negotiate.c:185
+#: src/ssl/state.c:172
 msgid "The CRL is not yet valid."
 msgstr "A lista de certificados revogados ainda não é válida."
  
-#: ssl/state.c:215
+#: src/ssl/state.c:209
 msgid "The CRL lastUpdate field contains an invalid time."
 msgstr "Campo \"lastUpdate\" do CRL contem horário inválido."
  
-#: ssl/state.c:223
+#: src/ssl/state.c:217
 msgid "The CRL nextUpdate field contains an invalid time."
 msgstr "Campo \"nextUpdate\" contem horário inválido."
  
-#: ssl/state.c:131
+#: src/ssl/state.c:125
 msgid ""
 "The CRL signature could not be decrypted: this means that the actual "
 "signature value could not be determined rather than it not matching the "
@@ -2305,38 +2335,38 @@ msgstr &quot;&quot;
 "signature value could not be determined rather than it not matching the "
 "expected value. Unused."
  
-#: ssl/state.c:191 ssl/negotiate.c:195
+#: src/ssl/state.c:185
 msgid "The Certificate revocation list (CRL) has expired."
 msgstr "A lista de revogação de certificados (CRL) está expirada."
  
-#: ssl/state.c:179 ssl/negotiate.c:186
+#: src/ssl/state.c:173
 msgid "The Certificate revocation list (CRL) is not yet valid."
 msgstr "A lista de revogação de certificados (CRL) ainda não é válida."
  
-#: ssl/state.c:115 ssl/negotiate.c:177
+#: src/ssl/state.c:109
 msgid ""
 "The Certificate revocation list (CRL) of a certificate could not be found."
 msgstr ""
 "A lista de revogação de certificados (CRL) de um certificado não pôde ser "
 "encontrada."
  
-#: ssl/state.c:247 ssl/negotiate.c:210
+#: src/ssl/state.c:241 src/ssl/negotiate.c:200
 msgid "The SSL certificate for this host is not trusted."
 msgstr "O certificado SSL deste servidor não é confiável"
  
-#: ssl/linux/getcrl.c:289 ssl/linux/getcrl.c:301
+#: src/ssl/linux/getcrl.c:301 src/ssl/linux/getcrl.c:313
 msgid "The URL argument should be in the format ldap://[HOST]/[DN]?attribute"
 msgstr "A URL deve ser no formato ldap://[HOST]/[DN]?attribute"
  
-#: ssl/linux/getcrl.c:248
+#: src/ssl/linux/getcrl.c:250
 msgid "The URL for the CRL is undefined or empty"
 msgstr "A URL para o CRL não está definida ou vazia"
  
-#: ssl/linux/getcrl.c:560
+#: src/ssl/linux/getcrl.c:592
 msgid "The URL scheme is unknown"
 msgstr "O tipo de URL é desconhecido"
  
-#: ssl/state.c:294
+#: src/ssl/state.c:288
 msgid "The basicConstraints pathlength parameter has been exceeded."
 msgstr "The basicConstraints pathlength parameter has been exceeded."
  
@@ -2348,7 +2378,7 @@ msgstr &quot;&quot;
 "Tabela de callbacks para transferência de arquivos inválida, possível "
 "divergência de versão na lib3270"
  
-#: ssl/state.c:253
+#: src/ssl/state.c:247
 msgid ""
 "The certificate chain could be built up using the untrusted certificates but "
 "the root could not be found locally."
@@ -2356,11 +2386,11 @@ msgstr &quot;&quot;
 "The certificate chain could be built up using the untrusted certificates but "
 "the root could not be found locally."
  
-#: ssl/state.c:278
+#: src/ssl/state.c:272
 msgid "The certificate has been revoked."
 msgstr "O certificado foi revogado."
  
-#: ssl/state.c:171
+#: src/ssl/state.c:165
 msgid ""
 "The certificate has expired: that is the notAfter date is before the current "
 "time."
@@ -2368,7 +2398,7 @@ msgstr &quot;&quot;
 "The certificate has expired: that is the notAfter date is before the current "
 "time."
  
-#: ssl/state.c:163
+#: src/ssl/state.c:157
 msgid ""
 "The certificate is not yet valid: the notBefore date is after the current "
 "time."
@@ -2376,15 +2406,15 @@ msgstr &quot;&quot;
 "The certificate is not yet valid: the notBefore date is after the current "
 "time."
  
-#: ssl/state.c:207
+#: src/ssl/state.c:201
 msgid "The certificate notAfter field contains an invalid time."
 msgstr "The certificate notAfter field contains an invalid time."
  
-#: ssl/state.c:199
+#: src/ssl/state.c:193
 msgid "The certificate notBefore field contains an invalid time."
 msgstr "The certificate notBefore field contains an invalid time."
  
-#: ssl/state.c:123
+#: src/ssl/state.c:117
 msgid ""
 "The certificate signature could not be decrypted. This means that the actual "
 "signature value could not be determined rather than it not matching the "
@@ -2394,19 +2424,19 @@ msgstr &quot;&quot;
 "signature value could not be determined rather than it not matching the "
 "expected value, this is only meaningful for RSA keys."
  
-#: properties.c:221
+#: src/core/properties.c:276
 msgid "The color type"
 msgstr "O tipo de cor"
  
-#: ssl/state.c:377 ssl/state.c:405 ssl/state.c:432
+#: src/ssl/state.c:375 src/ssl/state.c:403 src/ssl/state.c:430
 msgid "The connection is insecure"
 msgstr "A conexão não é segura"
  
-#: ssl/state.c:99
+#: src/ssl/state.c:93
 msgid "The connection is secure and the host identity was confirmed."
 msgstr "A conexão é segura e a identidade do servidor foi confirmada."
  
-#: ssl/state.c:342
+#: src/ssl/state.c:336
 msgid ""
 "The current candidate issuer certificate was rejected because its issuer "
 "name and serial number was present and did not match the authority key "
@@ -2418,7 +2448,7 @@ msgstr &quot;&quot;
 "identifier of the current certificate. Only displayed when the -"
 "issuer_checks option is set."
  
-#: ssl/state.c:350
+#: src/ssl/state.c:344
 msgid ""
 "The current candidate issuer certificate was rejected because its keyUsage "
 "extension does not permit certificate signing."
@@ -2426,7 +2456,7 @@ msgstr &quot;&quot;
 "The current candidate issuer certificate was rejected because its keyUsage "
 "extension does not permit certificate signing."
  
-#: ssl/state.c:334
+#: src/ssl/state.c:328
 msgid ""
 "The current candidate issuer certificate was rejected because its subject "
 "key identifier was present and did not match the authority key identifier "
@@ -2436,7 +2466,7 @@ msgstr &quot;&quot;
 "key identifier was present and did not match the authority key identifier "
 "current certificate. Only displayed when the -issuer_checks option is set."
  
-#: ssl/state.c:326
+#: src/ssl/state.c:320
 msgid ""
 "The current candidate issuer certificate was rejected because its subject "
 "name did not match the issuer name of the current certificate. Only "
@@ -2446,17 +2476,23 @@ msgstr &quot;&quot;
 "name did not match the issuer name of the current certificate. Only "
 "displayed when the -issuer_checks option is set."
  
-#: properties.c:263
+#: src/core/properties.c:237
 msgid "The delay between the host unlocking the keyboard and the actual unlock"
 msgstr ""
 "Intervalo de tempo entre o desbloqueio de teclado pelo host e o desbloqueio "
 "real"
  
-#: dialog.c:241
-msgid "The file already exists. Replace it?"
-msgstr "O arquivo já existe, substituir?"
+#: src/terminal/callbacks.c:462
+#, c-format
+msgid "The error code was %d"
+msgstr "O código de erro foi %d"
+
+#: src/dialogs/save/save.c:455
+#, c-format
+msgid "The file \"%s\" already exists. Replace it?"
+msgstr "O arquivo \"%s\" já existe, substituir?"
  
-#: ftmessages.c:60 src/filetransfer/v3270ftprogress.c:76
+#: src/core/ftmessages.c:60 src/filetransfer/v3270ftprogress.c:76
 msgid ""
 "The file transfer operation has been completed, and any record greater than "
 "the logical record length (LRECL) of the file being appended has been "
@@ -2465,18 +2501,18 @@ msgstr &quot;&quot;
 "A transferência de arquivos foi concluída e qualquer registro maior que o "
 "comprimento definido foi dividido e se transformou em vários registros."
  
-#: ftmessages.c:53 src/filetransfer/v3270ftprogress.c:70
+#: src/core/ftmessages.c:53 src/filetransfer/v3270ftprogress.c:70
 msgid "The file transfer operation has been successfully completed."
 msgstr "A transferência de arquivos terminou com sucesso."
  
-#: ftmessages.c:81 ftmessages.c:88 src/filetransfer/v3270ftprogress.c:94
-#: src/filetransfer/v3270ftprogress.c:100
+#: src/core/ftmessages.c:81 src/core/ftmessages.c:88
+#: src/filetransfer/v3270ftprogress.c:94 src/filetransfer/v3270ftprogress.c:100
 msgid ""
 "The host program has detected an error in the file data during a RECEIVE "
 "operation."
 msgstr "O host detectou um erro no arquivo durante a operação de recebimento."
  
-#: ssl/state.c:262
+#: src/ssl/state.c:256
 msgid ""
 "The issuer certificate could not be found: this occurs if the issuer "
 "certificate of an untrusted certificate cannot be found."
@@ -2484,7 +2520,7 @@ msgstr &quot;&quot;
 "The issuer certificate could not be found: this occurs if the issuer "
 "certificate of an untrusted certificate cannot be found."
  
-#: ssl/state.c:107
+#: src/ssl/state.c:101
 msgid ""
 "The issuer certificate of a looked up certificate could not be found. This "
 "normally means the list of trusted certificates is not complete."
@@ -2497,15 +2533,15 @@ msgstr &quot;&quot;
 msgid "The known types are %s"
 msgstr "Os tipos conhecidos são %s"
  
-#: properties.c:214
+#: src/core/properties.c:269
 msgid "The model number"
 msgstr "Nº do modelo"
  
-#: main.c:372
+#: main.c:308
 msgid "The model of 3270 display to be emulated"
 msgstr "Modelo de tela 3270 a ser emulada"
  
-#: properties.c:362
+#: src/core/properties.c:389
 msgid "The name of the active LU"
 msgstr "Nome da LU ativa"
  
@@ -2513,7 +2549,7 @@ msgstr &quot;Nome da LU ativa&quot;
 msgid "The name of the file in the host"
 msgstr "Nome do arquivo no host"
  
-#: ssl/state.c:239
+#: src/ssl/state.c:233
 msgid ""
 "The passed certificate is self signed and the same certificate cannot be "
 "found in the list of trusted certificates."
@@ -2521,28 +2557,28 @@ msgstr &quot;&quot;
 "The passed certificate is self signed and the same certificate cannot be "
 "found in the list of trusted certificates."
  
-#: ssl/state.c:139
+#: src/ssl/state.c:133
 msgid ""
 "The public key in the certificate SubjectPublicKeyInfo could not be read."
 msgstr ""
 "The public key in the certificate SubjectPublicKeyInfo could not be read."
  
-#: ft.c:277
+#: src/core/ft.c:278
 msgid "The remote file name is invalid."
 msgstr "O nome do arquivo remoto não é válido."
  
-#: ssl/state.c:318
+#: src/ssl/state.c:312
 msgid "The root CA is marked to reject the specified purpose."
 msgstr ""
 "O certificado raiz está marcado para rejeitar a finalidade especificada."
  
-#: ssl/state.c:310
+#: src/ssl/state.c:304
 msgid "The root CA is not marked as trusted for the specified purpose."
 msgstr ""
 "O Certificado raiz não está marcado como confiável para os fins "
 "especificados."
  
-#: ssl/state.c:248 ssl/negotiate.c:211
+#: src/ssl/state.c:242 src/ssl/negotiate.c:201
 msgid ""
 "The security certificate presented by this host was not issued by a trusted "
 "certificate authority."
@@ -2550,21 +2586,21 @@ msgstr &quot;&quot;
 "O certificado de segurança apresentado pelo servidor não foi assinado por "
 "uma autoridade certificadora confiável."
  
-#: properties.c:432
+#: src/core/properties.c:459
 msgid "The security state"
 msgstr "O estado da segurança"
  
-#: ssl/state.c:147 ssl/state.c:155
+#: src/ssl/state.c:141 src/ssl/state.c:149
 msgid "The signature of the certificate is invalid."
 msgstr "A assinatura do certificado não é válida."
  
-#: ssl/state.c:302
+#: src/ssl/state.c:296
 msgid "The supplied certificate cannot be used for the specified purpose."
 msgstr ""
 "O certificado fornecido não pode ser utilizado para a finalidade "
 "especificada."
  
-#: ftmessages.c:146 src/filetransfer/v3270ftprogress.c:150
+#: src/core/ftmessages.c:146 src/filetransfer/v3270ftprogress.c:150
 msgid "There is not enough space available for data on the host."
 msgstr "Não existe espaço suficiente no host para os dados."
  
@@ -2577,11 +2613,11 @@ msgstr &quot;Não encontrei configuração para a tabela de caracteres \&quot;%s\&quot;&quot;
 msgid "There's no security information in the session"
 msgstr "Não existe informação de segurança na sessão"
  
-#: ftmessages.c:223 src/filetransfer/v3270ftprogress.c:216
+#: src/core/ftmessages.c:223 src/filetransfer/v3270ftprogress.c:216
 msgid "This is a host program error."
 msgstr "Este é um erro no programa do host."
  
-#: dialog.c:480
+#: dialog.c:306
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -2610,7 +2646,7 @@ msgstr &quot;&quot;
 "programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple "
 "Place, Suite 330, Boston, MA, 02111-1307, USA"
  
-#: main.c:485
+#: main.c:418
 #, c-format
 msgid "This program requires GTK version %d.%d.%d"
 msgstr "Este programa precisa do GTK versão %d.%d.%d"
@@ -2635,23 +2671,23 @@ msgstr &quot;Total:&quot;
 msgid "Trace"
 msgstr "Trace"
  
-#: toggles.c:99 98trace.xml:36
+#: src/core/toggles.c:100 98trace.xml:36
 msgid "Trace Data Stream"
 msgstr "Trace Data Stream"
  
-#: toggles.c:231 98trace.xml:40
+#: src/core/toggles.c:232 98trace.xml:40
 msgid "Trace SSL negotiation"
 msgstr "Trace da negociação SSL"
  
-#: toggles.c:123
+#: src/core/toggles.c:124
 msgid "Trace interface events"
 msgstr "Trace interface events"
  
-#: toggles.c:225 98trace.xml:38
+#: src/core/toggles.c:226 98trace.xml:38
 msgid "Trace network data flow"
 msgstr "Trace network data flow"
  
-#: toggles.c:117 98trace.xml:37
+#: src/core/toggles.c:118 98trace.xml:37
 msgid "Trace screen contents"
 msgstr "Trace do conteúdo da tela"
  
@@ -2659,7 +2695,7 @@ msgstr &quot;Trace do conteúdo da tela&quot;
 msgid "Trace user interface events"
 msgstr "Trace user interface events"
  
-#: toggles.c:93 00default.xml:117
+#: src/core/toggles.c:94 00default.xml:117
 msgid "Track Cursor"
 msgstr "Mostrar posição do cursor"
  
@@ -2667,19 +2703,20 @@ msgstr &quot;Mostrar posição do cursor&quot;
 msgid "Tracks"
 msgstr "Trilhas"
  
-#: ft_cut.c:370
+#: src/core/ft_cut.c:371
 msgid "Transfer cancelled by host"
 msgstr "Transferência cancelada pelo host"
  
-#: ft_dft.c:233 ft_dft.c:376 ft_cut.c:399 ft_cut.c:494
+#: src/core/ft_dft.c:228 src/core/ft_dft.c:371 src/core/ft_cut.c:400
+#: src/core/ft_cut.c:495
 msgid "Transfer cancelled by user"
 msgstr "Transferência cancelada pelo usuário"
  
-#: ft.c:580
+#: src/core/ft.c:581
 msgid "Transfer complete"
 msgstr "Transferência completa"
  
-#: ft.c:585 src/filetransfer/worker.c:569
+#: src/core/ft.c:586 src/filetransfer/worker.c:569
 #: src/filetransfer/v3270ftprogress.c:720
 msgid "Transfer failed"
 msgstr "Transferência falhou"
@@ -2701,7 +2738,7 @@ msgstr &quot;Fila de transferências&quot;
 msgid "Transfer speed"
 msgstr "Velocidade de transferência"
  
-#: ft_cut.c:463
+#: src/core/ft_cut.c:464
 msgid "Transmission error"
 msgstr "Erro de transmissão"
  
@@ -2713,60 +2750,72 @@ msgstr &quot;Tente de novo com o mesmo arquivo.&quot;
 msgid "Turquoise"
 msgstr "Turquesa"
  
-#: properties.c:418
+#: src/core/properties.c:445
 msgid "URL for the certificate revocation list"
 msgstr "URL para a lista de certificados revogados"
  
-#: properties.c:369
+#: src/core/properties.c:396
 msgid "URL of the current host"
 msgstr "URL do host atual"
  
-#: dialog.c:64
+#: dialog.c:64 src/dialogs/save/save.c:71
 msgid "UTF-8"
 msgstr "UTF-8"
  
-#: ft_dft.c:173
+#: src/core/ft_dft.c:168
 msgid "Uknown DFT Open type from host"
 msgstr "Host enviou código de abertura DFT desconhecido"
  
-#: ssl/state.c:138
+#: src/ssl/state.c:132
 msgid "Unable to decode issuer public key"
 msgstr "Não é possível decodificar chave pública do emissor"
  
-#: ssl/state.c:130
+#: src/ssl/state.c:124
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 "Não foi possível decriptar assinatura da lista de certificados revogados"
  
-#: ssl/state.c:122
+#: src/ssl/state.c:116
 msgid "Unable to decrypt certificate's signature"
 msgstr "Incapaz de decifrar a assinatura do certificado"
  
-#: ssl/state.c:114 ssl/negotiate.c:176
+#: src/ssl/state.c:108
 msgid "Unable to get certificate CRL."
 msgstr "Incapaz de obter o CRL de um certificado."
  
-#: linux/connect.c:79
+#: src/core/linux/connect.c:81
 msgid "Unable to get connection state."
 msgstr "Não foi possível obter o estado da conexão."
  
-#: ssl/state.c:106
+#: src/ssl/state.c:100
 msgid "Unable to get issuer certificate"
 msgstr "Não foi possível obter emissor do certificado"
  
-#: ssl/state.c:261
+#: src/ssl/state.c:255
 msgid "Unable to get local issuer certificate"
 msgstr "Unable to get local issuer certificate"
  
-#: paste.c:336
+#: src/selection/linux/paste.c:114
+msgid "Unable to paste formatted data"
+msgstr "Incapaz de colar texto formatado"
+
+#: src/core/paste.c:341
 msgid "Unable to paste text"
 msgstr "Incapaz de colar texto"
  
-#: ft.c:528
+#: src/core/session.c:198
+msgid "Unable to print"
+msgstr "Incapaz de imprimir"
+
+#: src/core/session.c:206
+msgid "Unable to save"
+msgstr "Incapaz de salvar"
+
+#: src/core/ft.c:529
 msgid "Unable to send file-transfer request"
 msgstr "Não foi possível enviar a requisição de transferência de arquivo"
  
-#: ssl/state.c:269
+#: src/ssl/state.c:263
 msgid "Unable to verify the first certificate"
 msgstr "Não foi possível verificar o primeiro certificado"
  
@@ -2779,72 +2828,82 @@ msgstr &quot;Indefinido&quot;
 msgid "Unexpected action attribute in <%s>"
 msgstr "Atributo inesperado \"action\" em <%s>"
  
-#: paste.c:337
+#: src/core/paste.c:342
 msgid "Unexpected error"
 msgstr "Erro inesperado"
  
+#: src/dialogs/save/save.c:440
+#, c-format
+msgid "Unexpected format %d"
+msgstr "Formato inesperado %d"
+
 #: action.c:77
 #, c-format
 msgid "Unexpected group \"%s\""
 msgstr "Grupo inesperado \"%s\""
  
-#: actions.c:576 actions.c:596
+#: src/dialogs/save/save.c:410
+#, c-format
+msgid "Unexpected mode %d"
+msgstr "Modo inesperado %d"
+
+#: actions.c:547 actions.c:567
 #, c-format
 msgid "Unexpected or invalid %s attribute: \"%s\""
 msgstr "Atributo %s inesperado ou inválido: \"%s\""
  
-#: ssl/linux/getcrl.c:559
+#: src/ssl/linux/getcrl.c:591
 msgid "Unexpected or invalid CRL URL"
 msgstr "URL do CRL é inesperada ou inválida"
  
-#: ssl/negotiate.c:224
+#: src/ssl/negotiate.c:178
 msgid "Unexpected or invalid TLS/SSL verify result"
 msgstr "O resultado da verificação TLS/SSL foi inesperado"
  
-#: actions.c:550
+#: actions.c:521
 #, c-format
 msgid "Unexpected or invalid attribute value \"%s\""
 msgstr "Valor de attributo inesperado ou inválido: \"%s\""
  
-#: main.c:160
+#: main.c:148
 #, c-format
 msgid "Unexpected or invalid color value \"%s\""
 msgstr "Valor de cor inválido ou inesperado: \"%s\""
  
-#: ssl/state.c:408
+#: src/ssl/state.c:406
 msgid "Unexpected or unknown security status"
 msgstr "Estado de segurança inesperado ou desconhecido."
  
-#: actions.c:466
+#: actions.c:437
 #, c-format
 msgid "Unexpected target \"%s\""
 msgstr "Alvo inesperado \"%s\""
  
-#: kybd.c:290
+#: src/core/kybd.c:290
 #, c-format
 msgid "Unexpected type %d in typeahead queue"
 msgstr "Tipo inesperado %d na fila de teclado"
  
-#: ctlr.c:756
+#: src/core/ctlr.c:780
 #, c-format
 msgid "Unknown 3270 Data Stream command: 0x%X"
 msgstr "Unknown 3270 Data Stream command: 0x%X"
  
-#: ft_cut.c:378
+#: src/core/ft_cut.c:379
 msgid "Unknown FT control code from host"
 msgstr "Servidor enviou código de controle FT desconhecido"
  
-#: kybd.c:2204
+#: src/core/kybd.c:2207
 #, c-format
 msgid "Unknown PA key %d"
 msgstr "PA %d desconhecida"
  
-#: kybd.c:2219
+#: src/core/kybd.c:2222
 #, c-format
 msgid "Unknown PF key %d"
 msgstr "PF %d desconhecida"
  
-#: ft_cut.c:302
+#: src/core/ft_cut.c:303
 msgid "Unknown frame type from host"
 msgstr "Servidor enviou tipo de frame desconhecido"
  
@@ -2853,15 +2912,19 @@ msgstr &quot;Servidor enviou tipo de frame desconhecido&quot;
 msgid "Unknown popup type \"%s\""
 msgstr "Tipo de popup \"%s\" não é conhecido"
  
-#: rpq.c:228
+#: src/core/rpq.c:230
 msgid "Unsupported RPQ term"
 msgstr "Unsupported RPQ term"
  
-#: ssl/state.c:301
+#: src/ssl/state.c:295
 msgid "Unsupported certificate purpose"
 msgstr "Finalidade do certificado não é suportada"
  
-#: toggles.c:195 00default.xml:130
+#: src/dialogs/save/save.c:163
+msgid "Untitled document"
+msgstr "Documento sem título"
+
+#: src/core/toggles.c:196 00default.xml:130
 msgid "Use +/- for field navigation"
 msgstr "Usar teclas +/- para navegar por campos"
  
@@ -2869,7 +2932,7 @@ msgstr &quot;Usar teclas +/- para navegar por campos&quot;
 msgid "Use host default record format."
 msgstr "Utilizar o formato de registro padrão do servidor."
  
-#: toggles.c:196
+#: src/core/toggles.c:197
 msgid "Use the keys +/- from keypad to select editable fields"
 msgstr "Use the keys +/- from keypad to select editable fields"
  
@@ -2877,20 +2940,20 @@ msgstr &quot;Use the keys +/- from keypad to select editable fields&quot;
 msgid "Variable"
 msgstr "Variável"
  
-#: dialog.c:500 dialog.c:502
+#: dialog.c:326 dialog.c:328
 #, c-format
 msgid "Version %s-%s"
 msgstr "Versão %s-%s"
  
-#: ft.c:537
+#: src/core/ft.c:538
 msgid "Waiting for GET response"
 msgstr "Aguardando resposta do pedido de download"
  
-#: ft.c:539
+#: src/core/ft.c:540
 msgid "Waiting for PUT response"
 msgstr "Aguardando resposta do pedido de upload"
  
-#: dialog.c:65
+#: dialog.c:65 src/dialogs/save/save.c:72
 msgid "Western Europe (ISO 8859-1)"
 msgstr "Europa ocidental (ISO 8859-1)"
  
@@ -2902,51 +2965,51 @@ msgstr &quot;Branco&quot;
 msgid "Window"
 msgstr "Janela"
  
-#: dialog.c:66
+#: dialog.c:66 src/dialogs/save/save.c:73
 msgid "Windows Western languages (CP1252)"
 msgstr "Windows ocidental (CP1252)"
  
-#: src/terminal/oia.c:431 src/terminal/oia.c:455 src/terminal/oia.c:459
+#: src/terminal/oia.c:432 src/terminal/oia.c:456 src/terminal/oia.c:460
 msgid "X"
 msgstr "X"
  
-#: src/terminal/oia.c:435
+#: src/terminal/oia.c:436
 msgid "X -f"
 msgstr "X -f"
  
-#: src/terminal/oia.c:467
+#: src/terminal/oia.c:468
 msgid "X Connecting"
 msgstr "X Conectando"
  
-#: src/terminal/oia.c:451
+#: src/terminal/oia.c:452
 msgid "X Inhibit"
 msgstr "X Inibido"
  
-#: src/terminal/oia.c:427
+#: src/terminal/oia.c:428
 msgid "X Not Connected"
 msgstr "X Desconectado"
  
-#: src/terminal/oia.c:443
+#: src/terminal/oia.c:444
 msgid "X Numeric"
 msgstr "X Numérico"
  
-#: src/terminal/oia.c:447
+#: src/terminal/oia.c:448
 msgid "X Overflow"
 msgstr "X Estouro"
  
-#: src/terminal/oia.c:439
+#: src/terminal/oia.c:440
 msgid "X Protected"
 msgstr "X Protegido"
  
-#: src/terminal/oia.c:463
+#: src/terminal/oia.c:464
 msgid "X Resolving"
 msgstr "X Resolvendo"
  
-#: src/terminal/oia.c:415
+#: src/terminal/oia.c:416
 msgid "X System"
 msgstr "X Sistema"
  
-#: src/terminal/oia.c:419
+#: src/terminal/oia.c:420
 msgid "X Wait"
 msgstr "X Aguarde"
  
@@ -2964,18 +3027,18 @@ msgstr &quot;Amarelo&quot;
 msgid "You can't add more than one acitivity with the same files."
 msgstr "Você não pode adicionar mais de uma operação com os mesmos arquivos"
  
-#: ftmessages.c:74 src/filetransfer/v3270ftprogress.c:88
+#: src/core/ftmessages.c:74 src/filetransfer/v3270ftprogress.c:88
 msgid ""
 "You did not enter the required parameters after a SEND or RECEIVE command."
 msgstr ""
 "Você não entrou os parametros necessários para um comando ENVIAR/RECEBER."
  
-#: ftmessages.c:195 src/filetransfer/v3270ftprogress.c:192
+#: src/core/ftmessages.c:195 src/filetransfer/v3270ftprogress.c:192
 msgid "You did not specify an existing CMS file for RECEIVE."
 msgstr ""
 "Você não especificou um arquivo CMS existente para a operação de recebimento."
  
-#: ftmessages.c:95 src/filetransfer/v3270ftprogress.c:106
+#: src/core/ftmessages.c:95 src/filetransfer/v3270ftprogress.c:106
 msgid ""
 "You need 30 KB of main storage (not disk space) on the host for the file "
 "transfer, in addition to the host requirement."
@@ -2983,14 +3046,14 @@ msgstr &quot;&quot;
 "Você precisa de 30 KB de armazenamento principal (não espaço em disco) no "
 "host para a transferência de arquivo, além do requerido pelo host."
  
-#: ftmessages.c:174 src/filetransfer/v3270ftprogress.c:174
+#: src/core/ftmessages.c:174 src/filetransfer/v3270ftprogress.c:174
 msgid ""
 "You selected an option that can only be used if SPACE is also specified."
 msgstr ""
 "Você selecionou uma opção que só pode ser usada se \"ESPAÇO\" também for "
 "específicado."
  
-#: ftmessages.c:153 src/filetransfer/v3270ftprogress.c:156
+#: src/core/ftmessages.c:153 src/filetransfer/v3270ftprogress.c:156
 msgid ""
 "You selected an option that is either not recognized, is specified as a "
 "positional keyword, or has an associated value that is incorrect."
@@ -2998,14 +3061,14 @@ msgstr &quot;&quot;
 "Você selecionou uma opção que, ou não foi reconhecida, foi especificada como "
 "uma palavra-chave posicional ou não tem um valor associado."
  
-#: ftmessages.c:181 src/filetransfer/v3270ftprogress.c:180
+#: src/core/ftmessages.c:181 src/filetransfer/v3270ftprogress.c:180
 msgid ""
 "You selected an option that is invalid with a host-partitioned data set."
 msgstr ""
 "Você selecionou uma opção que é inválida para um dataset particionado pelo "
 "host."
  
-#: ftmessages.c:167 src/filetransfer/v3270ftprogress.c:168
+#: src/core/ftmessages.c:167 src/filetransfer/v3270ftprogress.c:168
 msgid ""
 "You selected an option that is not valid with APPEND, but otherwise may be "
 "used."
@@ -3013,7 +3076,7 @@ msgstr &quot;&quot;
 "Você selecionou uma opção que não é válida com \"Adicionar\", porém, pode "
 "ser usada."
  
-#: ftmessages.c:160 src/filetransfer/v3270ftprogress.c:162
+#: src/core/ftmessages.c:160 src/filetransfer/v3270ftprogress.c:162
 msgid ""
 "You selected an option that is not valid with RECEIVE, but can be used with "
 "SEND."
@@ -3021,7 +3084,7 @@ msgstr &quot;&quot;
 "Você selecionou uma opção que não é válida para recebimento de arquivos, "
 "porém, pode ser usada para envio."
  
-#: ftmessages.c:202 src/filetransfer/v3270ftprogress.c:198
+#: src/core/ftmessages.c:202 src/filetransfer/v3270ftprogress.c:198
 msgid ""
 "You specified a CMS file mode for the SEND key that does not allow write "
 "access."
@@ -3029,13 +3092,13 @@ msgstr &quot;&quot;
 "Você especificou modo de arquivo CMS para um envio que não permite acesso de "
 "gravação."
  
-#: ftmessages.c:209 src/filetransfer/v3270ftprogress.c:204
+#: src/core/ftmessages.c:209 src/filetransfer/v3270ftprogress.c:204
 msgid "You specified a CMS file mode that is not in the CMS search order."
 msgstr ""
 "Você especificou um modo de arquivo CMS que não está na ordem de pesquisa "
 "CMS."
  
-#: ftmessages.c:139 src/filetransfer/v3270ftprogress.c:144
+#: src/core/ftmessages.c:139 src/filetransfer/v3270ftprogress.c:144
 msgid "You specified an option that is invalid."
 msgstr "Você especificou uma opção inválida."
  
@@ -3043,14 +3106,16 @@ msgstr &quot;Você especificou uma opção inválida.&quot;
 msgid "_ASCII text"
 msgstr "Texto _ASCII"
  
+#: src/selection/linux/paste.c:82 src/selection/linux/paste.c:122
 #: src/dialogs/settingsdialog.c:410 src/dialogs/settingsdialog.c:429
 #: src/dialogs/commondialog.c:94 src/dialogs/commondialog.c:108
 #: src/dialogs/commondialog.c:125 src/dialogs/linux/select.c:49
-#: src/dialogs/linux/select.c:93
+#: src/dialogs/linux/select.c:93 src/dialogs/save/save.c:307
+#: src/dialogs/save/save.c:326
 msgid "_Cancel"
 msgstr "_Cancelar"
  
-#: src/trace/widget.c:449 src/dialogs/transfer.c:174 src/dialogs/transfer.c:194
+#: src/trace/widget.c:451 src/dialogs/transfer.c:174 src/dialogs/transfer.c:194
 #: src/dialogs/security.c:203
 msgid "_Close"
 msgstr "_Close"
@@ -3071,10 +3136,14 @@ msgstr &quot;_Desconectar&quot;
 msgid "_Edit"
 msgstr "_Editar"
  
-#: src/trace/widget.c:441 00default.xml:34
+#: src/trace/widget.c:443 00default.xml:34
 msgid "_File"
 msgstr "_Arquivo"
  
+#: src/dialogs/save/save.c:203
+msgid "_Filename"
+msgstr "Nome do_Arquivo"
+
 #: print.c:421 src/dialogs/print/print.c:87
 msgid "_Font:"
 msgstr "_Fonte:"
@@ -3099,11 +3168,16 @@ msgstr &quot;_Operação:&quot;
 msgid "_Options"
 msgstr "_Opções"
  
+#: src/selection/linux/paste.c:83 src/selection/linux/paste.c:123
+msgid "_Paste as text"
+msgstr "_Colar como texto"
+
 #: src/filetransfer/v3270ft.c:342
 msgid "_Remote file"
 msgstr "Arquivo _remoto:"
  
-#: src/trace/widget.c:447
+#: src/trace/widget.c:449 src/dialogs/save/save.c:312
+#: src/dialogs/save/save.c:327
 msgid "_Save"
 msgstr "_Salvar"
  
@@ -3144,47 +3218,39 @@ msgstr &quot;Atributo inesperado \&quot;action\&quot; em &lt;%s&gt;&quot;
 msgid "an action attribute"
 msgstr "um atributo \"action\""
  
-#: session.c:386
+#: src/core/session.c:409
 msgid "bracket"
 msgstr "bracket"
  
-#: local/events.cc:163
-msgid "connected"
-msgstr "Conectado"
-
-#: toggles.c:333 linux/connect.c:228
+#: src/core/toggles.c:334 src/core/linux/connect.c:230
 msgid "disable"
 msgstr "desabilitar"
  
-#: local/events.cc:163
-msgid "disconnected"
-msgstr "Desconectado"
-
-#: toggles.c:333 linux/connect.c:228
+#: src/core/toggles.c:334 src/core/linux/connect.c:230
 msgid "enable"
 msgstr "habilitar"
  
-#: iocalls.c:562
+#: src/core/iocalls.c:565
 msgid "fcntl() error when getting socket state."
 msgstr "erro fcntl() ao obter estado do socket."
  
-#: iocalls.c:548
+#: src/core/iocalls.c:551
 msgid "ioctlsocket(FIONBIO) failed."
 msgstr "ioctlsocket(FIONBIO) failed."
  
-#: properties.c:411
+#: src/core/properties.c:438
 msgid "lib3270 revision"
 msgstr "Revisão da lib3270"
  
-#: properties.c:404
+#: src/core/properties.c:431
 msgid "lib3270 version"
 msgstr "Versão da lib3270"
  
-#: linux/connect.c:215
+#: src/core/linux/connect.c:217
 msgid "setsockopt(SO_OOBINLINE) has failed"
 msgstr "setsockopt(SO_OOBINLINE) has failed"
  
-#: dialog.c:541
+#: dialog.c:367
 msgid "translator-credits"
 msgstr "translator-credits"
  
@@ -3282,6 +3348,30 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Can't get DBUS object name"
 #~ msgstr "Não foi possível obter o nome do objeto DBUS"
  
+#~ msgid "Can't get screen contents"
+#~ msgstr "Não foi possível obter o conteúdo da tela"
+
+#~ msgid ""
+#~ "Can't save copy to file\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível salvar cópia para o arquivo\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Can't save screen to file\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível salvar a tela no arquivo\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Can't save selection to file\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível salvar a seleção para o arquivo\n"
+#~ "%s"
+
 #~ msgid "Can't set LDAP query"
 #~ msgstr "Não posso definir consulta LDAP"
  
@@ -3368,6 +3458,9 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Error in ioctl(%s) when setting no blocking mode"
 #~ msgstr "Erro em ioctl(%s) ao ativar o modo não blocante"
  
+#~ msgid "Error in vasprintf"
+#~ msgstr "Erro na chamada vasprintf"
+
 #~ msgid "Error resolving %s: %s"
 #~ msgstr "Erro ao resolver %s: %s"
  
@@ -3466,18 +3559,21 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Invalid proxy type '%.*s'"
 #~ msgstr "Tipo de proxy invalido '%.*s'"
  
+#~ msgid "Invalid session handler"
+#~ msgstr "Identificador de sessão é inválido"
+
 #~ msgid "Java"
 #~ msgstr "Java"
  
 #~ msgid "LRECL:"
 #~ msgstr "LRECL:"
  
+#~ msgid "Log to file"
+#~ msgstr "Enviar log para arquivo"
+
 #~ msgid "Missing ']'"
 #~ msgstr "Faltando ']'"
  
-#~ msgid "Multiple port names"
-#~ msgstr "Múltiplos nomes de porta"
-
 #~ msgid "Must specify port for telnet proxy"
 #~ msgstr "Proxy telnet precisa de porta"
  
@@ -3502,6 +3598,9 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Option '%c:' is not supported"
 #~ msgstr "Opção não suportada: '%c:'"
  
+#~ msgid "Out of memory in vasprintf"
+#~ msgstr "Memória insuficiente em vasprintf"
+
 #~ msgid "Output test"
 #~ msgstr "Output test"
  
@@ -3636,6 +3735,15 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "SSLv2/v3 read server hello A"
 #~ msgstr "SSLv2/v3 read server hello A"
  
+#~ msgid "Save copy to file"
+#~ msgstr "Salvar cópia para arquivo"
+
+#~ msgid "Save screen to file"
+#~ msgstr "Salvar tela para arquivo"
+
+#~ msgid "Save selection to file"
+#~ msgstr "Salvar seleção para arquivo"
+
 #~ msgid "Save trace file"
 #~ msgstr "Salvar arquivo de trace"
  
@@ -3658,6 +3766,9 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Send file to host"
 #~ msgstr "Enviar arquivo para o servidor"
  
+#~ msgid "Send messages to syslog"
+#~ msgstr "Enviar mensagens para o log do sistema"
+
 #~ msgid "Set terminal model (screen size)"
 #~ msgstr "Modelo de terminal (tamanho da tela)"
  
@@ -3759,9 +3870,6 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "Unexpected element <%s>"
 #~ msgstr "Elemento <%s> inesperado"
  
-#~ msgid "Unexpected state %04d"
-#~ msgstr "Estado inesperado %04d"
-
 #~ msgid ""
 #~ "Unknown host:\n"
 #~ "%s"
@@ -3824,6 +3932,12 @@ msgstr &quot;translator-credits&quot;
 #~ msgid "_Send"
 #~ msgstr "_Enviar"
  
+#~ msgid "connected"
+#~ msgstr "Conectado"
+
+#~ msgid "disconnected"
+#~ msgstr "Desconectado"
+
 #~ msgid "fcntl(%s)"
 #~ msgstr "fcntl(%s)"
  
@@ -9,7 +9,7 @@ msgstr &quot;&quot;
 "#-#-#-#-#  pw3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-08 14:15-0300\n"
+"POT-Creation-Date: 2019-07-30 10:50-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot;
 "#-#-#-#-#  lib3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-08 14:54+0000\n"
+"POT-Creation-Date: 2019-07-29 18:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,7 +31,7 @@ msgstr &quot;&quot;
 "#-#-#-#-#  libv3270.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-08 14:56+0000\n"
+"POT-Creation-Date: 2019-07-30 13:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,68 +56,73 @@ msgstr &quot;&quot;
 msgid " and <b>%s</b> for %s."
 msgstr ""
  
-#: telnet.c:688 iocalls.c:563 iocalls.c:580 linux/connect.c:80
-#: linux/connect.c:96
+#: src/core/telnet.c:689 src/core/iocalls.c:566 src/core/iocalls.c:583
+#: src/core/linux/connect.c:82 src/core/linux/connect.c:98
 #, c-format
 msgid "%s"
 msgstr ""
  
+#: src/core/connect.c:160
+#, c-format
+msgid "%s (SSL error %d)"
+msgstr ""
+
 #: window.c:363
 #, c-format
 msgid "%s - Disconnected"
 msgstr ""
  
-#: actions.c:853 actions.c:865
+#: actions.c:824 actions.c:836
 #, c-format
 msgid "%s action needs a valid id attribute"
 msgstr ""
  
-#: actions.c:701 actions.c:830 actions.c:842
+#: actions.c:672 actions.c:801 actions.c:813
 #, c-format
 msgid "%s action needs a valid toggle name"
 msgstr ""
  
-#: actions.c:877
+#: actions.c:848
 #, c-format
 msgid "%s action needs a valid value"
 msgstr ""
  
-#: actions.c:587
+#: actions.c:558
 #, c-format
 msgid "%s action needs src attribute"
 msgstr ""
  
-#: main.c:100
+#: main.c:88
 #, c-format
 msgid "%s requires GTK version %d.%d.%d"
 msgstr ""
  
-#: kybd.c:2441
+#: src/core/kybd.c:2444
 #, c-format
 msgid "%s: Bell not supported"
 msgstr ""
  
-#: kybd.c:2600
+#: src/core/kybd.c:2603
 #, c-format
 msgid "%s: Missing hex digits after \\x"
 msgstr ""
  
-#: kybd.c:2540
+#: src/core/kybd.c:2543
 #, c-format
 msgid "%s: Unknown character after \\p"
 msgstr ""
  
-#: kybd.c:2576
+#: src/core/kybd.c:2579
 #, c-format
 msgid "%s: Unknown character after \\pa"
 msgstr ""
  
-#: kybd.c:2554
+#: src/core/kybd.c:2557
 #, c-format
 msgid "%s: Unknown character after \\pf"
 msgstr ""
  
-#: kybd.c:2492
+#: src/core/kybd.c:2495
 #, c-format
 msgid "%s: Vertical tab not supported"
 msgstr ""
@@ -127,7 +132,7 @@ msgstr &quot;&quot;
 msgid "%s<b>%s</b> for %s"
 msgstr ""
  
-#: main.c:391
+#: main.c:322
 msgid "- 3270 Emulator for Gtk"
 msgstr ""
  
@@ -135,7 +140,8 @@ msgstr &quot;&quot;
 msgid "16 colors"
 msgstr ""
  
-#: screen.c:814 screen.c:851 screen.c:869 screen.c:994
+#: src/core/screen.c:816 src/core/screen.c:853 src/core/screen.c:871
+#: src/core/screen.c:996
 msgid "3270 Error"
 msgstr ""
  
@@ -145,15 +151,15 @@ msgstr &quot;&quot;
 msgid "3270 File transfer"
 msgstr ""
  
-#: screen.c:832
+#: src/core/screen.c:834
 msgid "3270 Warning"
 msgstr ""
  
-#: src/terminal/accessible.c:100
+#: src/terminal/accessible.c:101
 msgid "3270 screen"
 msgstr ""
  
-#: dialog.c:496
+#: dialog.c:322
 #, c-format
 msgid "3270 terminal emulator for GTK %d.%d"
 msgstr ""
@@ -188,7 +194,7 @@ msgstr &quot;&quot;
 msgid "<b>%s</b>\n"
 msgstr ""
  
-#: src/terminal/widget.c:199
+#: src/terminal/widget.c:198
 msgid ""
 "<b>Identity not verified</b>\n"
 "Disconnected from host"
@@ -198,7 +204,7 @@ msgstr &quot;&quot;
 msgid "<b>Text options</b>"
 msgstr ""
  
-#: main.c:411
+#: main.c:341
 msgid ""
 "<b>Valid options:</b>\n"
 "\n"
@@ -212,7 +218,7 @@ msgstr &quot;&quot;
 msgid "<separator> should be inside a <menu> or <toolbar>"
 msgstr ""
  
-#: ssl/state.c:286
+#: src/ssl/state.c:280
 msgid ""
 "A CA certificate is invalid. Either it is not a CA or its extensions are not "
 "consistent with the supplied purpose."
@@ -222,11 +228,11 @@ msgstr &quot;&quot;
 msgid "A_ppend to file"
 msgstr ""
  
-#: ft.c:103
+#: src/core/ft.c:104
 msgid "Abort sent; awaiting response"
 msgstr ""
  
-#: ft.c:676
+#: src/core/ft.c:677
 msgid "Aborting..."
 msgstr ""
  
@@ -234,11 +240,11 @@ msgstr &quot;&quot;
 msgid "About security"
 msgstr ""
  
-#: ft.c:101
+#: src/core/ft.c:102
 msgid "Ack received, data flowing"
 msgstr ""
  
-#: paste.c:335
+#: src/core/paste.c:340
 msgid "Action failed"
 msgstr ""
  
@@ -254,29 +260,30 @@ msgstr &quot;&quot;
 msgid "Address or name of the host to connect."
 msgstr ""
  
-#: toggles.c:201 00default.xml:129
+#: src/core/toggles.c:202 00default.xml:129
 msgid "Alert sound"
 msgstr ""
  
 #: src/filetransfer/v3270ft.c:310 src/filetransfer/settings.c:212
+#: src/dialogs/save/save.c:129
 msgid "All files"
 msgstr ""
  
-#: ftmessages.c:67 src/filetransfer/v3270ftprogress.c:82
+#: src/core/ftmessages.c:67 src/filetransfer/v3270ftprogress.c:82
 msgid "An error exists in the PC's file name."
 msgstr ""
  
-#: ftmessages.c:46 src/filetransfer/v3270ftprogress.c:64
+#: src/core/ftmessages.c:46 src/filetransfer/v3270ftprogress.c:64
 msgid ""
 "An error occurred in the file transfer, which may be an error in the data "
 "being transferred, or an unidentified system error."
 msgstr ""
  
-#: ssl/state.c:231
+#: src/ssl/state.c:225
 msgid "An error occurred trying to allocate memory. This should never happen."
 msgstr ""
  
-#: ftmessages.c:102 src/filetransfer/v3270ftprogress.c:112
+#: src/core/ftmessages.c:102 src/filetransfer/v3270ftprogress.c:112
 msgid "An invalid SEND or RECEIVE parameter was sent to the host."
 msgstr ""
  
@@ -284,11 +291,11 @@ msgstr &quot;&quot;
 msgid "Appends the source file to the destination file."
 msgstr ""
  
-#: main.c:377 main.c:379
+#: main.c:313 main.c:315
 msgid "Application name"
 msgstr ""
  
-#: main.c:431 main.c:436
+#: main.c:363 main.c:368
 #, c-format
 msgid "Application name set to \"%s\""
 msgstr ""
@@ -297,35 +304,35 @@ msgstr &quot;&quot;
 msgid "Attn"
 msgstr ""
  
-#: actions.c:562
+#: actions.c:533
 #, c-format
 msgid "Attribute \"%s\" is invalid or undefined"
 msgstr ""
  
-#: ssl/state.c:341
+#: src/ssl/state.c:335
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
  
-#: ssl/state.c:333
+#: src/ssl/state.c:327
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
  
-#: toggles.c:214
+#: src/core/toggles.c:215
 msgid "Auto resize on altscreen"
 msgstr ""
  
-#: toggles.c:153 00default.xml:124
+#: src/core/toggles.c:154 00default.xml:124
 msgid "Auto-Reconnect"
 msgstr ""
  
-#: toggles.c:112
+#: src/core/toggles.c:113
 msgid ""
 "Automatically convert trailing blanks in a field to NULLs in order to insert "
 "a character, and will automatically convert leading NULLs to blanks so that "
 "input data is not squeezed to the left"
 msgstr ""
  
-#: toggles.c:154
+#: src/core/toggles.c:155
 msgid "Automatically reconnect to the host if it ever disconnects"
 msgstr ""
  
@@ -333,7 +340,7 @@ msgstr &quot;&quot;
 msgid "Avblock"
 msgstr ""
  
-#: ft.c:102
+#: src/core/ft.c:103
 msgid "Awaiting chance to send an abort"
 msgstr ""
  
@@ -345,7 +352,7 @@ msgstr &quot;&quot;
 msgid "Background"
 msgstr ""
  
-#: toggles.c:202
+#: src/core/toggles.c:203
 msgid "Beep on errors"
 msgstr ""
  
@@ -353,11 +360,11 @@ msgstr &quot;&quot;
 msgid "Black"
 msgstr ""
  
-#: toggles.c:111 00default.xml:122
+#: src/core/toggles.c:112 00default.xml:122
 msgid "Blank Fill"
 msgstr ""
  
-#: toggles.c:81 00default.xml:115
+#: src/core/toggles.c:82 00default.xml:115
 msgid "Blinking Cursor"
 msgstr ""
  
@@ -369,11 +376,11 @@ msgstr &quot;&quot;
 msgid "Blue"
 msgstr ""
  
-#: toggles.c:171 00default.xml:125
+#: src/core/toggles.c:172 00default.xml:125
 msgid "Bold"
 msgstr ""
  
-#: dialog.c:539
+#: dialog.c:365
 msgid "Brazilian Public Software Portal"
 msgstr ""
  
@@ -381,30 +388,34 @@ msgstr &quot;&quot;
 msgid "Break"
 msgstr ""
  
-#: telnet.c:1655
+#: src/core/telnet.c:1656
 msgid "Broken pipe"
 msgstr ""
  
-#: ftmessages.c:215
+#: src/core/ftmessages.c:215
 msgid "CMS disk is full: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:208
+#: src/core/ftmessages.c:208
 msgid "CMS disk is not accessed: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:201
+#: src/core/ftmessages.c:201
 msgid "CMS disk is read-only: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:194
+#: src/core/ftmessages.c:194
 msgid "CMS file not found: file transfer canceled"
 msgstr ""
  
-#: ssl/state.c:154
+#: src/ssl/state.c:148
 msgid "CRL signature failure"
 msgstr ""
  
+#: src/dialogs/save/save.c:230
+msgid "C_haracter Coding"
+msgstr ""
+
 #: dialog.c:121
 msgid "C_haracter Coding:"
 msgstr ""
@@ -417,7 +428,7 @@ msgstr &quot;&quot;
 msgid "C_onnect"
 msgstr ""
  
-#: toggles.c:333 linux/connect.c:228
+#: src/core/toggles.c:334 src/core/linux/connect.c:230
 #, c-format
 msgid "Can't %s network keep-alive"
 msgstr ""
@@ -431,42 +442,43 @@ msgstr &quot;&quot;
 msgid "Can't add activity"
 msgstr ""
  
-#: ssl/linux/getcrl.c:342
+#: src/ssl/linux/getcrl.c:354
 msgid "Can't bind to LDAP server"
 msgstr ""
  
-#: linux/connect.c:88
+#: src/core/linux/connect.c:90
 #, c-format
 msgid "Can't connect to %s"
 msgstr ""
  
-#: linux/connect.c:178
+#: src/core/linux/connect.c:180
 #, c-format
 msgid "Can't connect to %s:%s"
 msgstr ""
  
-#: src/terminal/selection.c:472
+#: src/selection/text.c:150
 #, c-format
 msgid "Can't convert line %lu from %s to %s"
 msgstr ""
  
-#: ssl/linux/getcrl.c:412
-msgid "Can't decode CRL got from LDAP Search"
+#: src/ssl/linux/getcrl.c:280 src/ssl/linux/getcrl.c:426
+#: src/ssl/linux/getcrl.c:523
+msgid "Can't decode CRL"
 msgstr ""
  
-#: ssl/linux/getcrl.c:378 ssl/linux/getcrl.c:389
-msgid "Can't get LDAP attribute"
+#: src/ssl/linux/getcrl.c:576
+msgid "Can't decode CRL got from LDAP server"
 msgstr ""
  
-#: ft.c:431
-msgid "Can't get file size"
+#: src/ssl/linux/getcrl.c:390 src/ssl/linux/getcrl.c:402
+msgid "Can't get LDAP attribute"
 msgstr ""
  
-#: local/session.cc:124 local/session.cc:142
-msgid "Can't get screen contents"
+#: src/core/ft.c:432
+msgid "Can't get file size"
 msgstr ""
  
-#: ssl/linux/getcrl.c:320
+#: src/ssl/linux/getcrl.c:332
 msgid "Can't initialize LDAP"
 msgstr ""
  
@@ -475,7 +487,7 @@ msgstr &quot;&quot;
 msgid "Can't load %s"
 msgstr ""
  
-#: dialog.c:395
+#: dialog.c:221
 msgid "Can't load file"
 msgstr ""
  
@@ -488,7 +500,7 @@ msgstr &quot;&quot;
 msgid "Can't load plugin %s"
 msgstr ""
  
-#: ssl/linux/getcrl.c:247 ssl/linux/getcrl.c:265
+#: src/ssl/linux/getcrl.c:249 src/ssl/linux/getcrl.c:268
 msgid "Can't open CRL File"
 msgstr ""
  
@@ -522,11 +534,15 @@ msgstr &quot;&quot;
 msgid "Can't parse unnamed element"
 msgstr ""
  
-#: src/terminal/callbacks.c:345
+#: src/selection/linux/paste.c:78 src/selection/linux/paste.c:118
+msgid "Can't paste"
+msgstr ""
+
+#: src/core/session.c:198 src/terminal/callbacks.c:345
 msgid "Can't print"
 msgstr ""
  
-#: ssl/ctx_init.c:224
+#: src/ssl/ctx_init.c:146
 #, c-format
 msgid "Can't read SSL certificates from \"%s\""
 msgstr ""
@@ -536,52 +552,35 @@ msgstr &quot;&quot;
 msgid "Can't recognize \"%s\" as a valid host type"
 msgstr ""
  
-#: config.c:575
+#: src/core/session.c:206
+msgid "Can't save"
+msgstr ""
+
+#: config.c:573
 #, c-format
 msgid "Can't save \"%s\": %s"
 msgstr ""
  
 #: src/filetransfer/save.c:116 src/filetransfer/activitylist.c:437
-#: src/trace/widget.c:493 src/dialogs/transfer.c:96
+#: src/trace/widget.c:495 src/dialogs/transfer.c:96 src/dialogs/save/save.c:495
 #, c-format
 msgid "Can't save %s"
 msgstr ""
  
-#: dialog.c:371
-#, c-format
-msgid ""
-"Can't save copy to file\n"
-"%s"
-msgstr ""
-
-#: dialog.c:217 src/trace/widget.c:497
+#: src/trace/widget.c:499
 msgid "Can't save file"
 msgstr ""
  
-#: dialog.c:336
-#, c-format
-msgid ""
-"Can't save screen to file\n"
-"%s"
-msgstr ""
-
-#: dialog.c:354
-#, c-format
-msgid ""
-"Can't save selection to file\n"
-"%s"
-msgstr ""
-
 #: window.c:176
 #, c-format
 msgid "Can't save trace data to file %s"
 msgstr ""
  
-#: ssl/linux/getcrl.c:367
+#: src/ssl/linux/getcrl.c:379
 msgid "Can't search LDAP server"
 msgstr ""
  
-#: ssl/linux/getcrl.c:331
+#: src/ssl/linux/getcrl.c:343
 msgid "Can't set LDAP version"
 msgstr ""
  
@@ -593,15 +592,15 @@ msgstr &quot;&quot;
 msgid "Can't set host charset"
 msgstr ""
  
-#: src/terminal/iocallback.c:198
+#: src/terminal/iocallback.c:199
 msgid "Can't set lib3270 I/O controller"
 msgstr ""
  
-#: iocalls.c:579
+#: src/core/iocalls.c:582
 msgid "Can't set socket to blocking mode."
 msgstr ""
  
-#: iocalls.c:579
+#: src/core/iocalls.c:582
 msgid "Can't set socket to non blocking mode"
 msgstr ""
  
@@ -609,15 +608,16 @@ msgstr &quot;&quot;
 msgid "Can't start file transfer session"
 msgstr ""
  
-#: ft.c:208
+#: src/core/ft.c:209
 msgid "Can't start file transfer."
 msgstr ""
  
-#: ssl/negotiate.c:223
+#: src/ssl/negotiate.c:177
 msgid "Can't verify."
 msgstr ""
  
-#: src/filetransfer/v3270ftprogress.c:432 src/filetransfer/transfer.c:89
+#: src/terminal/callbacks.c:467 src/filetransfer/v3270ftprogress.c:432
+#: src/filetransfer/transfer.c:89 src/dialogs/save/save.c:150
 msgid "Cancel"
 msgstr ""
  
@@ -625,53 +625,53 @@ msgstr &quot;&quot;
 msgid "Cancel transfer operation."
 msgstr ""
  
-#: ft.c:160
+#: src/core/ft.c:161
 msgid "Cancelled by user"
 msgstr ""
  
-#: telnet.c:1083
+#: src/core/telnet.c:1084
 msgid "Cannot connect to specified LU"
 msgstr ""
  
-#: ssl/negotiate.c:102
+#: src/ssl/negotiate.c:105
 msgid "Cant create a new SSL structure for current connection."
 msgstr ""
  
-#: ssl/ctx_init.c:203
+#: src/ssl/ctx_init.c:125
 msgid "Cant initialize the SSL context."
 msgstr ""
  
-#: ssl/negotiate.c:132
+#: src/ssl/negotiate.c:135
 msgid ""
 "Cant set the file descriptor for the input/output facility for the TLS/SSL "
 "(encrypted) side of ssl."
 msgstr ""
  
-#: ssl/state.c:170
+#: src/ssl/state.c:164
 msgid "Certificate has expired"
 msgstr ""
  
-#: ssl/state.c:162
+#: src/ssl/state.c:156
 msgid "Certificate is not yet valid"
 msgstr ""
  
-#: ssl/state.c:309
+#: src/ssl/state.c:303
 msgid "Certificate not trusted"
 msgstr ""
  
-#: ssl/state.c:317
+#: src/ssl/state.c:311
 msgid "Certificate rejected"
 msgstr ""
  
-#: ssl/state.c:277
+#: src/ssl/state.c:271
 msgid "Certificate revoked"
 msgstr ""
  
-#: ssl/state.c:146
+#: src/ssl/state.c:140
 msgid "Certificate signature failure"
 msgstr ""
  
-#: tools.c:312 src/terminal/selection.c:474
+#: tools.c:312 src/selection/text.c:152
 msgid "Charset error"
 msgstr ""
  
@@ -687,6 +687,18 @@ msgstr &quot;&quot;
 msgid "Clear"
 msgstr ""
  
+#: src/dialogs/save/save.c:308
+msgid "Click to cancel operation"
+msgstr ""
+
+#: src/dialogs/save/save.c:313
+msgid "Click to save file"
+msgstr ""
+
+#: src/terminal/properties.c:303
+msgid "Clipboard name"
+msgstr ""
+
 #: colors.c:631
 msgid "Color scheme:"
 msgstr ""
@@ -699,11 +711,15 @@ msgstr &quot;&quot;
 msgid "Colors"
 msgstr ""
  
-#: ftmessages.c:73
+#: src/dialogs/save/save.c:55
+msgid "Comma-separated values (CSV)"
+msgstr ""
+
+#: src/core/ftmessages.c:73
 msgid "Command incomplete: file transfer canceled"
 msgstr ""
  
-#: src/trace/widget.c:286
+#: src/trace/widget.c:288
 msgid "Command to execute"
 msgstr ""
  
@@ -711,26 +727,31 @@ msgstr &quot;&quot;
 msgid "Configure host"
 msgstr ""
  
-#: toggles.c:189 00default.xml:114
+#: src/core/toggles.c:190 00default.xml:114
 msgid "Connect on startup"
 msgstr ""
  
-#: iocalls.c:547 linux/connect.c:182 linux/connect.c:214 linux/connect.c:232
+#: src/core/iocalls.c:550 src/core/linux/connect.c:184
+#: src/core/linux/connect.c:216 src/core/linux/connect.c:234
 msgid "Connection error"
 msgstr ""
  
-#: linux/connect.c:94
+#: src/core/linux/connect.c:96
 msgid "Connection failed"
 msgstr ""
  
-#: telnet.c:1659
+#: src/core/telnet.c:1660
 msgid "Connection reset by peer"
 msgstr ""
  
-#: properties.c:249
+#: src/core/properties.c:283
 msgid "Connection state"
 msgstr ""
  
+#: src/terminal/callbacks.c:468
+msgid "Continue"
+msgstr ""
+
 #: 00default.xml:58
 msgid "Copy"
 msgstr ""
@@ -755,11 +776,12 @@ msgstr &quot;&quot;
 msgid "Creates a file with variable-length records."
 msgstr ""
  
-#: colors.c:519 toggles.c:141 src/dialogs/colors.c:315 00default.xml:121
+#: colors.c:519 src/core/toggles.c:142 src/dialogs/colors.c:315
+#: 00default.xml:121
 msgid "Cross hair cursor"
 msgstr ""
  
-#: dialog.c:138
+#: dialog.c:138 src/dialogs/save/save.c:239
 #, c-format
 msgid "Current (%s)"
 msgstr ""
@@ -768,12 +790,12 @@ msgstr &quot;&quot;
 msgid "Current file"
 msgstr ""
  
-#: properties.c:228
-msgid "Current screen width in columns"
+#: src/core/properties.c:223
+msgid "Current screen height in rows"
 msgstr ""
  
-#: properties.c:235
-msgid "Current screen width in rows"
+#: src/core/properties.c:216
+msgid "Current screen width in columns"
 msgstr ""
  
 #: src/filetransfer/tables.c:222
@@ -784,7 +806,7 @@ msgstr &quot;&quot;
 msgid "Current:"
 msgstr ""
  
-#: properties.c:207
+#: src/core/properties.c:209
 msgid "Cursor address"
 msgstr ""
  
@@ -816,7 +838,7 @@ msgstr &quot;&quot;
 msgid "Dark Turquoise"
 msgstr ""
  
-#: ft_cut.c:156 ft_cut.c:165
+#: src/core/ft_cut.c:157 src/core/ft_cut.c:166
 msgid "Data conversion error"
 msgstr ""
  
@@ -832,7 +854,7 @@ msgstr &quot;&quot;
 msgid "Default"
 msgstr ""
  
-#: properties.c:425
+#: src/core/properties.c:452
 msgid "Default host URL"
 msgstr ""
  
@@ -840,19 +862,19 @@ msgstr &quot;&quot;
 msgid "Delete field"
 msgstr ""
  
-#: properties.c:439
+#: src/core/properties.c:466
 msgid "Description of the current security state"
 msgstr ""
  
-#: telnet.c:1330
+#: src/core/telnet.c:1331
 msgid "Device type rejected"
 msgstr ""
  
-#: ft.c:266
+#: src/core/ft.c:267
 msgid "Disconnected from host."
 msgstr ""
  
-#: properties.c:397
+#: src/core/properties.c:424
 msgid "Display charset"
 msgstr ""
  
@@ -860,11 +882,11 @@ msgstr &quot;&quot;
 msgid "Display current charset"
 msgstr ""
  
-#: toggles.c:94
+#: src/core/toggles.c:95
 msgid "Display the cursor location in the OIA (the status line)"
 msgstr ""
  
-#: telnet.c:879
+#: src/core/telnet.c:880
 msgid "EOR received when not in 3270 mode, ignored."
 msgstr ""
  
@@ -872,15 +894,15 @@ msgstr &quot;&quot;
 msgid "ETA:"
 msgstr ""
  
-#: toggles.c:232
+#: src/core/toggles.c:233
 msgid "Enable SSL messages trace"
 msgstr ""
  
-#: toggles.c:226
+#: src/core/toggles.c:227
 msgid "Enable network in/out trace"
 msgstr ""
  
-#: toggles.c:220
+#: src/core/toggles.c:221
 msgid "Enable network keep-alive with SO_KEEPALIVE"
 msgstr ""
  
@@ -908,46 +930,42 @@ msgstr &quot;&quot;
 msgid "Erase to end of line"
 msgstr ""
  
-#: print.c:247 util.c:589 src/terminal/widget.c:160
+#: print.c:247 src/core/util.c:590 src/terminal/widget.c:159
 msgid "Error"
 msgstr ""
  
-#: ft_dft.c:457 ft_cut.c:422
+#: src/core/ft_dft.c:452 src/core/ft_cut.c:423
 #, c-format
 msgid "Error \"%s\" reading from local file (rc=%d)"
 msgstr ""
  
-#: ft_dft.c:335 ft_cut.c:527
+#: src/core/ft_dft.c:330 src/core/ft_cut.c:528
 #, c-format
 msgid "Error \"%s\" writing to local file (rc=%d)"
 msgstr ""
  
-#: ftmessages.c:45
+#: src/core/ftmessages.c:45
 msgid "Error in file transfer: file transfer canceled"
 msgstr ""
  
-#: local/events.cc:59
-msgid "Error in vasprintf"
-msgstr ""
-
-#: dialog.c:393
+#: dialog.c:219
 #, c-format
 msgid "Error loading %s"
 msgstr ""
  
-#: ssl/linux/getcrl.c:471 ssl/linux/getcrl.c:486
+#: src/ssl/linux/getcrl.c:485 src/ssl/linux/getcrl.c:501
 msgid "Error loading CRL"
 msgstr ""
  
-#: ftmessages.c:87
+#: src/core/ftmessages.c:87
 msgid "Error reading file from host: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:145
+#: src/core/ftmessages.c:145
 msgid "Error while reading or writing to host disk: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:80
+#: src/core/ftmessages.c:80
 msgid "Error writing file to host: file transfer canceled"
 msgstr ""
  
@@ -963,15 +981,19 @@ msgstr &quot;&quot;
 msgid "Field colors"
 msgstr ""
  
-#: ftmessages.c:52
+#: src/dialogs/save/save.c:270
+msgid "File _Format"
+msgstr ""
+
+#: src/core/ftmessages.c:52
 msgid "File transfer complete"
 msgstr ""
  
-#: ftmessages.c:59
+#: src/core/ftmessages.c:59
 msgid "File transfer complete with records segmented"
 msgstr ""
  
-#: ft.c:271
+#: src/core/ft.c:272
 msgid "File transfer is already active in this session."
 msgstr ""
  
@@ -995,27 +1017,31 @@ msgid &quot;&quot;
 "records in the PC file."
 msgstr ""
  
-#: ssl/state.c:214
+#: src/terminal/properties.c:273
+msgid "Font family for terminal contents"
+msgstr ""
+
+#: src/ssl/state.c:208
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
  
-#: ssl/state.c:222
+#: src/ssl/state.c:216
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
  
-#: ssl/state.c:206
+#: src/ssl/state.c:200
 msgid "Format error in certificate's notAfter field"
 msgstr ""
  
-#: ssl/state.c:198
+#: src/ssl/state.c:192
 msgid "Format error in certificate's notBefore field"
 msgstr ""
  
-#: properties.c:174
+#: src/core/properties.c:175
 msgid "Formatted screen"
 msgstr ""
  
-#: toggles.c:147 00default.xml:118
+#: src/core/toggles.c:148 00default.xml:118
 msgid "Full Screen"
 msgstr ""
  
@@ -1031,7 +1057,7 @@ msgstr &quot;&quot;
 msgid "Function bar"
 msgstr ""
  
-#: main.c:104 main.c:489
+#: main.c:92 main.c:422
 msgid "GTK Version mismatch"
 msgstr ""
  
@@ -1043,11 +1069,11 @@ msgstr &quot;&quot;
 msgid "Get transfer queue from file"
 msgstr ""
  
-#: ssl/linux/getcrl.c:528
-msgid "Got an invalid CRL from LDAP server"
+#: src/ssl/linux/getcrl.c:546
+msgid "Got a bad formatted CRL from LDAP server"
 msgstr ""
  
-#: ssl/linux/getcrl.c:506 ssl/linux/getcrl.c:515 ssl/linux/getcrl.c:545
+#: src/ssl/linux/getcrl.c:532
 msgid "Got an invalid CRL from server"
 msgstr ""
  
@@ -1059,7 +1085,7 @@ msgstr &quot;&quot;
 msgid "Green"
 msgstr ""
  
-#: properties.c:160
+#: src/core/properties.c:161
 msgid "Has selected area"
 msgstr ""
  
@@ -1067,55 +1093,59 @@ msgstr &quot;&quot;
 msgid "Help"
 msgstr ""
  
-#: properties.c:390
+#: src/core/properties.c:417
 msgid "Host charset"
 msgstr ""
  
-#: ft.c:685
+#: src/core/ft.c:686
 msgid "Host disconnected, transfer cancelled"
 msgstr ""
  
-#: telnet.c:1388
+#: src/core/telnet.c:1389
 msgid "Host illegally added function(s)"
 msgstr ""
  
-#: ftmessages.c:222
+#: src/core/ftmessages.c:222
 msgid "Host program error code xxxxxxxxxx: file transfer canceled"
 msgstr ""
  
-#: telnet.c:1313
+#: src/core/telnet.c:1314
 msgid "Host rejected device type or request type"
 msgstr ""
  
-#: telnet.c:1326
+#: src/core/telnet.c:1327
 msgid "Host rejected resource(s)"
 msgstr ""
  
-#: main.c:367
+#: main.c:303
 msgid "Host system type"
 msgstr ""
  
-#: main.c:365
+#: main.c:301
 msgid "Host to connect"
 msgstr ""
  
-#: properties.c:383
+#: src/core/properties.c:410
 msgid "Host type name"
 msgstr ""
  
-#: options.c:49
+#: src/dialogs/save/save.c:59
+msgid "HyperText Markup Language (HTML)"
+msgstr ""
+
+#: src/core/options.c:49
 msgid "IBM AS/400"
 msgstr ""
  
-#: options.c:43
+#: src/core/options.c:43
 msgid "IBM S/390"
 msgstr ""
  
-#: toggles.c:148
+#: src/core/toggles.c:149
 msgid "If set, asks to place the toplevel window in the fullscreen state"
 msgstr ""
  
-#: toggles.c:130
+#: src/core/toggles.c:131
 msgid ""
 "If set, puts restrictions on how pasted text is placed on the screen. The "
 "position of the cursor at the time the paste operation is begun is used as a "
@@ -1124,28 +1154,28 @@ msgid &quot;&quot;
 "that use the left side of the screen for control information"
 msgstr ""
  
-#: toggles.c:82
+#: src/core/toggles.c:83
 msgid "If set, the cursor blinks"
 msgstr ""
  
-#: toggles.c:76
+#: src/core/toggles.c:77
 msgid "If set, the terminal operates in uppercase-only mode"
 msgstr ""
  
-#: toggles.c:136
+#: src/core/toggles.c:137
 msgid ""
 "If set, the terminal will always select rectangular areas of the screen. "
 "Otherwise, it selects continuous regions of the screen"
 msgstr ""
  
-#: toggles.c:142
+#: src/core/toggles.c:143
 msgid ""
 "If set, the terminal will display a crosshair over the cursor: lines "
 "extending the full width and height of the screen, centered over the cursor "
 "position. This makes locating the cursor on the screen much easier"
 msgstr ""
  
-#: toggles.c:88
+#: src/core/toggles.c:89
 msgid ""
 "If set, the time taken by the host to process an AID is displayed on the "
 "status line"
@@ -1159,15 +1189,15 @@ msgstr &quot;&quot;
 msgid "Ignore the fail and remove the file from queue."
 msgstr ""
  
-#: ft_cut.c:504
+#: src/core/ft_cut.c:505
 msgid "Illegal frame length"
 msgstr ""
  
-#: ftmessages.c:138
+#: src/core/ftmessages.c:138
 msgid "Incorrect option specified: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:101
+#: src/core/ftmessages.c:101
 msgid "Incorrect request code: file transfer canceled"
 msgstr ""
  
@@ -1187,11 +1217,11 @@ msgstr &quot;&quot;
 msgid "Intensified/Unprotected"
 msgstr ""
  
-#: ssl/state.c:285
+#: src/ssl/state.c:279
 msgid "Invalid CA certificate"
 msgstr ""
  
-#: local/session.cc:69 src/terminal/callbacks.c:429
+#: src/terminal/callbacks.c:495
 msgid "Invalid callback table, possible version mismatch in lib3270"
 msgstr ""
  
@@ -1203,23 +1233,23 @@ msgstr &quot;&quot;
 msgid "Invalid character value"
 msgstr ""
  
-#: ftmessages.c:166
+#: src/core/ftmessages.c:166
 msgid "Invalid option xxxxxxxx with APPEND: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:180
+#: src/core/ftmessages.c:180
 msgid "Invalid option xxxxxxxx with PDS: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:159
+#: src/core/ftmessages.c:159
 msgid "Invalid option xxxxxxxx with RECEIVE: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:173
+#: src/core/ftmessages.c:173
 msgid "Invalid option xxxxxxxx without SPACE: file transfer canceled"
 msgstr ""
  
-#: ftmessages.c:152
+#: src/core/ftmessages.c:152
 msgid "Invalid option xxxxxxxx: file transfer canceled"
 msgstr ""
  
@@ -1227,43 +1257,39 @@ msgstr &quot;&quot;
 msgid "Invalid remap scope"
 msgstr ""
  
-#: local/events.cc:88 local/events.cc:141
-msgid "Invalid session handler"
-msgstr ""
-
 #: src/dialogs/security.c:181
 msgid "Invalid state"
 msgstr ""
  
-#: properties.c:83
+#: src/core/properties.c:84
 msgid "Is connection secure"
 msgstr ""
  
-#: properties.c:167
+#: src/core/properties.c:168
 msgid "Is starting (no first screen)?"
 msgstr ""
  
-#: properties.c:76
+#: src/core/properties.c:77
 msgid "Is terminal connected"
 msgstr ""
  
-#: properties.c:153
+#: src/core/properties.c:154
 msgid "Is terminal in the INITIAL_E state?"
 msgstr ""
  
-#: properties.c:69
+#: src/core/properties.c:70
 msgid "Is terminal ready"
 msgstr ""
  
-#: toggles.c:177 00default.xml:127
+#: src/core/toggles.c:178 00default.xml:127
 msgid "Keep selected"
 msgstr ""
  
-#: ssl/state.c:349
+#: src/ssl/state.c:343
 msgid "Key usage does not include certificate signing"
 msgstr ""
  
-#: paste.c:337
+#: src/core/paste.c:342
 msgid "Keyboard is locked"
 msgstr ""
  
@@ -1271,7 +1297,7 @@ msgstr &quot;&quot;
 msgid "Lateral keypad"
 msgstr ""
  
-#: properties.c:256
+#: src/core/properties.c:290
 msgid "Latest program message"
 msgstr ""
  
@@ -1296,11 +1322,7 @@ msgstr &quot;&quot;
 msgid "Local:"
 msgstr ""
  
-#: main.c:386
-msgid "Log to file"
-msgstr ""
-
-#: main.c:373
+#: main.c:309
 msgid "Minutes for auto-disconnect"
 msgstr ""
  
@@ -1313,11 +1335,11 @@ msgstr &quot;&quot;
 msgid "Model %d (%s)"
 msgstr ""
  
-#: properties.c:376
+#: src/core/properties.c:403
 msgid "Model name"
 msgstr ""
  
-#: toggles.c:75 00default.xml:116
+#: src/core/toggles.c:76 00default.xml:116
 msgid "Monocase"
 msgstr ""
  
@@ -1325,7 +1347,7 @@ msgstr &quot;&quot;
 msgid "Monochrome"
 msgstr ""
  
-#: actions.c:718
+#: actions.c:689
 msgid "Move action needs target & direction attributes"
 msgstr ""
  
@@ -1333,11 +1355,12 @@ msgstr &quot;&quot;
 msgid "Mustard"
 msgstr ""
  
-#: telnet.c:354 linux/event_dispatcher.c:144 linux/connect.c:78
+#: src/core/telnet.c:355 src/core/linux/event_dispatcher.c:143
+#: src/core/linux/connect.c:80
 msgid "Network error"
 msgstr ""
  
-#: toggles.c:219 00default.xml:131
+#: src/core/toggles.c:220 00default.xml:131
 msgid "Network keep alive"
 msgstr ""
  
@@ -1345,11 +1368,11 @@ msgstr &quot;&quot;
 msgid "Next field"
 msgstr ""
  
-#: ssl/linux/getcrl.c:288
+#: src/ssl/linux/getcrl.c:300
 msgid "No DN of the entry at which to start the search on the URL"
 msgstr ""
  
-#: ssl/linux/getcrl.c:300
+#: src/ssl/linux/getcrl.c:312
 msgid "No LDAP attribute on the URL"
 msgstr ""
  
@@ -1357,7 +1380,7 @@ msgstr &quot;&quot;
 msgid "No active transfer"
 msgstr ""
  
-#: ssl/state.c:270
+#: src/ssl/state.c:264
 msgid ""
 "No signatures could be verified because the chain contains only one "
 "certificate and it is not self signed."
@@ -1367,15 +1390,15 @@ msgstr &quot;&quot;
 msgid "No transfer"
 msgstr ""
  
-#: ft.c:100 src/filetransfer/worker.c:602
+#: src/core/ft.c:101 src/filetransfer/worker.c:602
 msgid "No transfer in progress"
 msgstr ""
  
-#: properties.c:97
+#: src/core/properties.c:98
 msgid "Non zero if the host is AS400."
 msgstr ""
  
-#: properties.c:90
+#: src/core/properties.c:91
 msgid "Non zero if the host is TSO."
 msgstr ""
  
@@ -1387,10 +1410,14 @@ msgstr &quot;&quot;
 msgid "Normal/Unprotected"
 msgstr ""
  
-#: ft.c:692
+#: src/core/ft.c:693
 msgid "Not in 3270 mode, transfer cancelled"
 msgstr ""
  
+#: src/selection/linux/paste.c:74
+msgid "Not the same terminal type"
+msgstr ""
+
 #: colors.c:526 src/dialogs/colors.c:322
 msgid "OIA Warning"
 msgstr ""
@@ -1415,13 +1442,14 @@ msgstr &quot;&quot;
 msgid "OIA status ok"
 msgstr ""
  
-#: ftmessages.c:187
+#: src/core/ftmessages.c:187
 msgid "Only one of TRACKS, CYLINDERS, AVBLOCK allowed: file transfer canceled"
 msgstr ""
  
 #: src/terminal/callbacks.c:343 src/filetransfer/save.c:118
 #: src/filetransfer/load.c:272 src/filetransfer/activitylist.c:440
-#: src/dialogs/transfer.c:99
+#: src/dialogs/transfer.c:99 src/dialogs/save/save.c:498
+#: src/dialogs/save/convenience.c:65 src/dialogs/save/convenience.c:94
 msgid "Operation has failed"
 msgstr ""
  
@@ -1433,22 +1461,18 @@ msgstr &quot;&quot;
 msgid "Orange"
 msgstr ""
  
-#: options.c:55
+#: src/core/options.c:55
 msgid "Other (TSO)"
 msgstr ""
  
-#: options.c:61
+#: src/core/options.c:61
 msgid "Other (VM/CMS)"
 msgstr ""
  
-#: ssl/state.c:230
+#: src/ssl/state.c:224
 msgid "Out of memory"
 msgstr ""
  
-#: local/events.cc:71
-msgid "Out of memory in vasprintf"
-msgstr ""
-
 #: 10keypad.xml:68
 msgid "PA1"
 msgstr ""
@@ -1557,7 +1581,7 @@ msgstr &quot;&quot;
 msgid "PF9"
 msgstr ""
  
-#: main.c:409
+#: main.c:339
 msgid "Parse error"
 msgstr ""
  
@@ -1578,11 +1602,11 @@ msgstr &quot;&quot;
 msgid "Paste text file"
 msgstr ""
  
-#: dialog.c:433
+#: dialog.c:259
 msgid "Paste text file contents"
 msgstr ""
  
-#: toggles.c:129 00default.xml:120
+#: src/core/toggles.c:130 00default.xml:120
 msgid "Paste with left margin"
 msgstr ""
  
@@ -1590,11 +1614,11 @@ msgstr &quot;&quot;
 msgid "Path and name of the local file"
 msgstr ""
  
-#: main.c:374
+#: main.c:310
 msgid "Path for plugin files"
 msgstr ""
  
-#: ssl/state.c:293
+#: src/ssl/state.c:287
 msgid "Path length constraint exceeded"
 msgstr ""
  
@@ -1602,7 +1626,7 @@ msgstr &quot;&quot;
 msgid "Peer certificate"
 msgstr ""
  
-#: ftmessages.c:66
+#: src/core/ftmessages.c:66
 msgid "Personal computer filespec incorrect: file transfer canceled"
 msgstr ""
  
@@ -1610,6 +1634,10 @@ msgstr &quot;&quot;
 msgid "Pink"
 msgstr ""
  
+#: src/dialogs/save/save.c:51
+msgid "Plain text"
+msgstr ""
+
 #: src/dialogs/hostselect.c:140
 msgid "Port or service name (empty for \"telnet\")."
 msgstr ""
@@ -1672,79 +1700,79 @@ msgstr &quot;&quot;
 msgid "Quit"
 msgstr ""
  
-#: rpq.c:234
+#: src/core/rpq.c:236
 #, c-format
 msgid "RPQ %s term omitted due to insufficient space"
 msgstr ""
  
-#: rpq.c:346
+#: src/core/rpq.c:348
 #, c-format
 msgid "RPQ %s term override ignored"
 msgstr ""
  
-#: rpq.c:637 rpq.c:707
+#: src/core/rpq.c:639 src/core/rpq.c:709
 #, c-format
 msgid "RPQ ADDRESS term has unrecognized family %u"
 msgstr ""
  
-#: rpq.c:645 rpq.c:674 rpq.c:714
+#: src/core/rpq.c:647 src/core/rpq.c:676 src/core/rpq.c:716
 msgid "RPQ ADDRESS term incomplete due to space limit"
 msgstr ""
  
-#: rpq.c:227
+#: src/core/rpq.c:229
 msgid "RPQ Error"
 msgstr ""
  
-#: rpq.c:414 rpq.c:423
+#: src/core/rpq.c:416 src/core/rpq.c:425
 msgid "RPQ TIMEZONE term is invalid - use +/-hhmm"
 msgstr ""
  
-#: rpq.c:514
+#: src/core/rpq.c:516
 msgid "RPQ USER term has non-hex character"
 msgstr ""
  
-#: rpq.c:539
+#: src/core/rpq.c:541
 msgid "RPQ USER term has odd number of hex digits"
 msgstr ""
  
-#: rpq.c:520
+#: src/core/rpq.c:522
 #, c-format
 msgid "RPQ USER term truncated after %d bytes"
 msgstr ""
  
-#: rpq.c:564
+#: src/core/rpq.c:566
 #, c-format
 msgid "RPQ USER term truncated after %d characters"
 msgstr ""
  
-#: rpq.c:358
+#: src/core/rpq.c:360
 #, c-format
 msgid "RPQ term \"%s\" is unrecognized"
 msgstr ""
  
-#: rpq.c:229
+#: src/core/rpq.c:231
 #, c-format
 msgid "RPQ term %d is unknown"
 msgstr ""
  
-#: rpq.c:458
+#: src/core/rpq.c:460
 msgid "RPQ timezone exceeds 12 hour UTC offset"
 msgstr ""
  
-#: rpq.c:443
+#: src/core/rpq.c:445
 msgid "RPQ: Unable to determine workstation UTC time"
 msgstr ""
  
-#: rpq.c:436
+#: src/core/rpq.c:438
 msgid "RPQ: Unable to determine workstation local time"
 msgstr ""
  
-#: rpq.c:650
+#: src/core/rpq.c:652
 #, c-format
 msgid "RPQ: can't resolve '%s': %s"
 msgstr ""
  
-#: rpq.c:663
+#: src/core/rpq.c:665
 msgid "RPQ: gethostbyname error"
 msgstr ""
  
@@ -1784,7 +1812,7 @@ msgstr &quot;&quot;
 msgid "Remap Failed"
 msgstr ""
  
-#: main.c:371
+#: main.c:307
 msgid "Remap charset from xml file"
 msgstr ""
  
@@ -1810,11 +1838,11 @@ msgstr &quot;&quot;
 msgid "Remove selection"
 msgstr ""
  
-#: ft.c:208
+#: src/core/ft.c:209
 msgid "Request failed"
 msgstr ""
  
-#: ftmessages.c:94
+#: src/core/ftmessages.c:94
 msgid "Required host storage unavailable: file transfer canceled"
 msgstr ""
  
@@ -1826,7 +1854,7 @@ msgstr &quot;&quot;
 msgid "Reset"
 msgstr ""
  
-#: toggles.c:213 00default.xml:119
+#: src/core/toggles.c:214 00default.xml:119
 msgid "Resize on alternate screen"
 msgstr ""
  
@@ -1842,34 +1870,29 @@ msgstr &quot;&quot;
 msgid "Revocation list"
 msgstr ""
  
-#: ftmessages.c:188 src/filetransfer/v3270ftprogress.c:186
+#: src/core/ftmessages.c:188 src/filetransfer/v3270ftprogress.c:186
 msgid ""
 "SPACE can be specified in units of TRACKS, CYLINDERS, or AVBLOCK, and only "
 "one option can be used."
 msgstr ""
  
-#: ssl/negotiate.c:154
+#: src/ssl/negotiate.c:157
 msgid "SSL Connect failed"
 msgstr ""
  
-#: telnet.c:666
+#: src/core/telnet.c:667
 msgid "SSL Error"
 msgstr ""
  
-#: telnet.c:666
+#: src/core/telnet.c:667
 msgid "SSL Read error"
 msgstr ""
  
-#: ssl/negotiate.c:175 ssl/negotiate.c:184 ssl/negotiate.c:193
-#: ssl/negotiate.c:209 ssl/negotiate.c:222
-msgid "SSL error"
-msgstr ""
-
-#: ssl/negotiate.c:131
+#: src/ssl/negotiate.c:134
 msgid "SSL negotiation failed"
 msgstr ""
  
-#: telnet.c:1645
+#: src/core/telnet.c:1646
 #, c-format
 msgid ""
 "SSL_write:\n"
@@ -1877,20 +1900,20 @@ msgid &quot;&quot;
 msgstr ""
  
 #: src/filetransfer/v3270ft.c:217 src/filetransfer/activitylist.c:460
-#: src/trace/widget.c:519 src/dialogs/transfer.c:72
+#: src/trace/widget.c:521 src/dialogs/transfer.c:72
 msgid "Save"
 msgstr ""
  
-#: src/trace/widget.c:448
+#: src/trace/widget.c:450
 msgid "Save _As"
 msgstr ""
  
-#: 00default.xml:44
-msgid "Save copy"
+#: src/dialogs/save/save.c:342
+msgid "Save copied data"
 msgstr ""
  
-#: dialog.c:370
-msgid "Save copy to file"
+#: 00default.xml:44
+msgid "Save copy"
 msgstr ""
  
 #: src/filetransfer/v3270ft.c:216 src/filetransfer/activitylist.c:459
@@ -1901,19 +1924,19 @@ msgstr &quot;&quot;
 msgid "Save screen"
 msgstr ""
  
-#: dialog.c:335
-msgid "Save screen to file"
-msgstr ""
-
 #: 00default.xml:43
 msgid "Save selected"
 msgstr ""
  
-#: dialog.c:353
-msgid "Save selection to file"
+#: src/dialogs/save/save.c:341
+msgid "Save selected area"
+msgstr ""
+
+#: src/dialogs/save/save.c:340
+msgid "Save terminal contents"
 msgstr ""
  
-#: src/trace/widget.c:518
+#: src/trace/widget.c:520
 msgid "Save trace to file"
 msgstr ""
  
@@ -1937,12 +1960,12 @@ msgstr &quot;&quot;
 msgid "Save transfer queue to file"
 msgstr ""
  
-#: config.c:570
+#: config.c:568
 #, c-format
 msgid "Saving %s"
 msgstr ""
  
-#: properties.c:242
+#: src/core/properties.c:230
 msgid "Screen buffer length in bytes"
 msgstr ""
  
@@ -1954,11 +1977,11 @@ msgstr &quot;&quot;
 msgid "Scripts"
 msgstr ""
  
-#: ssl/linux/getcrl.c:379
+#: src/ssl/linux/getcrl.c:391
 msgid "Search did not produce any attributes."
 msgstr ""
  
-#: ssl/linux/getcrl.c:390
+#: src/ssl/linux/getcrl.c:403
 msgid "Search did not produce any values."
 msgstr ""
  
@@ -1972,22 +1995,31 @@ msgstr &quot;&quot;
 msgid "Secondary space"
 msgstr ""
  
-#: ssl/state.c:98
+#: src/ssl/state.c:92
 msgid "Secure connection was successful."
 msgstr ""
  
-#: ssl/negotiate.c:101 ssl/negotiate.c:130 ssl/negotiate.c:153
-#: ssl/ctx_init.c:202 ssl/ctx_init.c:229 ssl/linux/getcrl.c:246
-#: ssl/linux/getcrl.c:264 ssl/linux/getcrl.c:287 ssl/linux/getcrl.c:299
-#: ssl/linux/getcrl.c:319 ssl/linux/getcrl.c:330 ssl/linux/getcrl.c:341
-#: ssl/linux/getcrl.c:366 ssl/linux/getcrl.c:377 ssl/linux/getcrl.c:388
-#: ssl/linux/getcrl.c:411 ssl/linux/getcrl.c:462 ssl/linux/getcrl.c:485
-#: ssl/linux/getcrl.c:505 ssl/linux/getcrl.c:514 ssl/linux/getcrl.c:527
-#: ssl/linux/getcrl.c:544 ssl/linux/getcrl.c:558
+#: src/ssl/negotiate.c:104 src/ssl/negotiate.c:133 src/ssl/negotiate.c:156
+#: src/ssl/negotiate.c:176 src/ssl/negotiate.c:199 src/ssl/negotiate.c:218
+#: src/ssl/ctx_init.c:124 src/ssl/ctx_init.c:151 src/ssl/linux/getcrl.c:248
+#: src/ssl/linux/getcrl.c:267 src/ssl/linux/getcrl.c:279
+#: src/ssl/linux/getcrl.c:299 src/ssl/linux/getcrl.c:311
+#: src/ssl/linux/getcrl.c:331 src/ssl/linux/getcrl.c:342
+#: src/ssl/linux/getcrl.c:353 src/ssl/linux/getcrl.c:378
+#: src/ssl/linux/getcrl.c:389 src/ssl/linux/getcrl.c:401
+#: src/ssl/linux/getcrl.c:425 src/ssl/linux/getcrl.c:476
+#: src/ssl/linux/getcrl.c:500 src/ssl/linux/getcrl.c:522
+#: src/ssl/linux/getcrl.c:531 src/ssl/linux/getcrl.c:545
+#: src/ssl/linux/getcrl.c:575 src/ssl/linux/getcrl.c:590
 msgid "Security error"
 msgstr ""
  
+#: src/ssl/negotiate.c:222
+msgid "Security warning"
+msgstr ""
+
 #: src/filetransfer/v3270ft.c:307 src/filetransfer/settings.c:209
+#: src/dialogs/save/save.c:126 src/dialogs/save/save.c:151
 msgid "Select"
 msgstr ""
  
@@ -1999,11 +2031,16 @@ msgstr &quot;&quot;
 msgid "Select all"
 msgstr ""
  
-#: toggles.c:135 00default.xml:123
+#: src/core/toggles.c:136 00default.xml:123
 msgid "Select by rectangles"
 msgstr ""
  
+#: src/dialogs/save/save.c:125 src/dialogs/save/save.c:147
+msgid "Select destination file"
+msgstr ""
+
 #: src/filetransfer/v3270ft.c:577 src/filetransfer/settings.c:470
+#: src/dialogs/save/save.c:216
 msgid "Select file"
 msgstr ""
  
@@ -2031,7 +2068,7 @@ msgstr &quot;&quot;
 msgid "Select previous file"
 msgstr ""
  
-#: linux/event_dispatcher.c:145
+#: src/core/linux/event_dispatcher.c:144
 msgid "Select() failed when processing for events."
 msgstr ""
  
@@ -2043,11 +2080,11 @@ msgstr &quot;&quot;
 msgid "Selection foreground"
 msgstr ""
  
-#: ssl/state.c:238
+#: src/ssl/state.c:232
 msgid "Self signed certificate"
 msgstr ""
  
-#: ssl/state.c:252
+#: src/ssl/state.c:246
 msgid "Self signed certificate in certificate chain"
 msgstr ""
  
@@ -2055,10 +2092,6 @@ msgstr &quot;&quot;
 msgid "Send file"
 msgstr ""
  
-#: main.c:383
-msgid "Send messages to syslog"
-msgstr ""
-
 #: src/filetransfer/tables.c:142
 msgid "Send text file"
 msgstr ""
@@ -2071,31 +2104,31 @@ msgstr &quot;&quot;
 msgid "Sending file"
 msgstr ""
  
-#: main.c:360 main.c:362
+#: main.c:296 main.c:298
 msgid "Session name"
 msgstr ""
  
-#: main.c:370
+#: main.c:306
 msgid "Set host charset"
 msgstr ""
  
-#: toggles.c:159
+#: src/core/toggles.c:160
 msgid "Set insert mode"
 msgstr ""
  
-#: main.c:366
+#: main.c:302
 msgid "Set reported colors (8/16)"
 msgstr ""
  
-#: main.c:369
+#: main.c:305
 msgid "Set toggles OFF"
 msgstr ""
  
-#: main.c:368
+#: main.c:304
 msgid "Set toggles ON"
 msgstr ""
  
-#: main.c:385
+#: main.c:318
 msgid "Set trace filename"
 msgstr ""
  
@@ -2107,11 +2140,11 @@ msgstr &quot;&quot;
 msgid "Setup host"
 msgstr ""
  
-#: toggles.c:207
+#: src/core/toggles.c:208
 msgid "Show Field attribute"
 msgstr ""
  
-#: toggles.c:183 00default.xml:126
+#: src/core/toggles.c:184 00default.xml:126
 msgid "Show Underline"
 msgstr ""
  
@@ -2119,7 +2152,7 @@ msgstr &quot;&quot;
 msgid "Show test pattern"
 msgstr ""
  
-#: toggles.c:87
+#: src/core/toggles.c:88
 msgid "Show timer when processing"
 msgstr ""
  
@@ -2131,19 +2164,19 @@ msgstr &quot;&quot;
 msgid "Skip this transfer, keep the file on queue."
 msgstr ""
  
-#: toggles.c:165 00default.xml:128
+#: src/core/toggles.c:166 00default.xml:128
 msgid "Smart paste"
 msgstr ""
  
-#: iocalls.c:561 iocalls.c:578
+#: src/core/iocalls.c:564 src/core/iocalls.c:581
 msgid "Socket error"
 msgstr ""
  
-#: telnet.c:692
+#: src/core/telnet.c:693
 msgid "Socket read error"
 msgstr ""
  
-#: telnet.c:1666
+#: src/core/telnet.c:1667
 msgid "Socket write error"
 msgstr ""
  
@@ -2201,11 +2234,11 @@ msgstr &quot;&quot;
 msgid "Starting transfer"
 msgstr ""
  
-#: properties.c:132
+#: src/core/properties.c:133
 msgid "State is 3270, TN3270e or SSCP"
 msgstr ""
  
-#: ssl/state.c:325
+#: src/ssl/state.c:319
 msgid "Subject issuer mismatch"
 msgstr ""
  
@@ -2213,15 +2246,19 @@ msgstr &quot;&quot;
 msgid "System _type"
 msgstr ""
  
-#: telnet.c:1154
+#: src/core/telnet.c:1155
 msgid "TLS negotiation failure"
 msgstr ""
  
+#: src/terminal/properties.c:288
+msgid "TN3270 Session name"
+msgstr ""
+
 #: colors.c:487 src/dialogs/colors.c:206 src/dialogs/colors.c:283
 msgid "Terminal colors"
 msgstr ""
  
-#: src/trace/widget.c:522
+#: src/trace/widget.c:524
 msgid "Text file"
 msgstr ""
  
@@ -2229,66 +2266,66 @@ msgstr &quot;&quot;
 msgid "Text files"
 msgstr ""
  
-#: ftmessages.c:216 src/filetransfer/v3270ftprogress.c:210
+#: src/core/ftmessages.c:216 src/filetransfer/v3270ftprogress.c:210
 msgid ""
 "The CMS disk is full, or the maximum number of files on the minidisk (3400) "
 "has been reached, or the maximum number of data blocks per file (16060) has "
 "been reached."
 msgstr ""
  
-#: ssl/state.c:190 ssl/negotiate.c:194
+#: src/ssl/state.c:184
 msgid "The CRL has expired."
 msgstr ""
  
-#: ssl/state.c:178 ssl/negotiate.c:185
+#: src/ssl/state.c:172
 msgid "The CRL is not yet valid."
 msgstr ""
  
-#: ssl/state.c:215
+#: src/ssl/state.c:209
 msgid "The CRL lastUpdate field contains an invalid time."
 msgstr ""
  
-#: ssl/state.c:223
+#: src/ssl/state.c:217
 msgid "The CRL nextUpdate field contains an invalid time."
 msgstr ""
  
-#: ssl/state.c:131
+#: src/ssl/state.c:125
 msgid ""
 "The CRL signature could not be decrypted: this means that the actual "
 "signature value could not be determined rather than it not matching the "
 "expected value. Unused."
 msgstr ""
  
-#: ssl/state.c:191 ssl/negotiate.c:195
+#: src/ssl/state.c:185
 msgid "The Certificate revocation list (CRL) has expired."
 msgstr ""
  
-#: ssl/state.c:179 ssl/negotiate.c:186
+#: src/ssl/state.c:173
 msgid "The Certificate revocation list (CRL) is not yet valid."
 msgstr ""
  
-#: ssl/state.c:115 ssl/negotiate.c:177
+#: src/ssl/state.c:109
 msgid ""
 "The Certificate revocation list (CRL) of a certificate could not be found."
 msgstr ""
  
-#: ssl/state.c:247 ssl/negotiate.c:210
+#: src/ssl/state.c:241 src/ssl/negotiate.c:200
 msgid "The SSL certificate for this host is not trusted."
 msgstr ""
  
-#: ssl/linux/getcrl.c:289 ssl/linux/getcrl.c:301
+#: src/ssl/linux/getcrl.c:301 src/ssl/linux/getcrl.c:313
 msgid "The URL argument should be in the format ldap://[HOST]/[DN]?attribute"
 msgstr ""
  
-#: ssl/linux/getcrl.c:248
+#: src/ssl/linux/getcrl.c:250
 msgid "The URL for the CRL is undefined or empty"
 msgstr ""
  
-#: ssl/linux/getcrl.c:560
+#: src/ssl/linux/getcrl.c:592
 msgid "The URL scheme is unknown"
 msgstr ""
  
-#: ssl/state.c:294
+#: src/ssl/state.c:288
 msgid "The basicConstraints pathlength parameter has been exceeded."
 msgstr ""
  
@@ -2298,56 +2335,56 @@ msgid &quot;&quot;
 "on lib3270"
 msgstr ""
  
-#: ssl/state.c:253
+#: src/ssl/state.c:247
 msgid ""
 "The certificate chain could be built up using the untrusted certificates but "
 "the root could not be found locally."
 msgstr ""
  
-#: ssl/state.c:278
+#: src/ssl/state.c:272
 msgid "The certificate has been revoked."
 msgstr ""
  
-#: ssl/state.c:171
+#: src/ssl/state.c:165
 msgid ""
 "The certificate has expired: that is the notAfter date is before the current "
 "time."
 msgstr ""
  
-#: ssl/state.c:163
+#: src/ssl/state.c:157
 msgid ""
 "The certificate is not yet valid: the notBefore date is after the current "
 "time."
 msgstr ""
  
-#: ssl/state.c:207
+#: src/ssl/state.c:201
 msgid "The certificate notAfter field contains an invalid time."
 msgstr ""
  
-#: ssl/state.c:199
+#: src/ssl/state.c:193
 msgid "The certificate notBefore field contains an invalid time."
 msgstr ""
  
-#: ssl/state.c:123
+#: src/ssl/state.c:117
 msgid ""
 "The certificate signature could not be decrypted. This means that the actual "
 "signature value could not be determined rather than it not matching the "
 "expected value, this is only meaningful for RSA keys."
 msgstr ""
  
-#: properties.c:221
+#: src/core/properties.c:276
 msgid "The color type"
 msgstr ""
  
-#: ssl/state.c:377 ssl/state.c:405 ssl/state.c:432
+#: src/ssl/state.c:375 src/ssl/state.c:403 src/ssl/state.c:430
 msgid "The connection is insecure"
 msgstr ""
  
-#: ssl/state.c:99
+#: src/ssl/state.c:93
 msgid "The connection is secure and the host identity was confirmed."
 msgstr ""
  
-#: ssl/state.c:342
+#: src/ssl/state.c:336
 msgid ""
 "The current candidate issuer certificate was rejected because its issuer "
 "name and serial number was present and did not match the authority key "
@@ -2355,59 +2392,65 @@ msgid &quot;&quot;
 "issuer_checks option is set."
 msgstr ""
  
-#: ssl/state.c:350
+#: src/ssl/state.c:344
 msgid ""
 "The current candidate issuer certificate was rejected because its keyUsage "
 "extension does not permit certificate signing."
 msgstr ""
  
-#: ssl/state.c:334
+#: src/ssl/state.c:328
 msgid ""
 "The current candidate issuer certificate was rejected because its subject "
 "key identifier was present and did not match the authority key identifier "
 "current certificate. Only displayed when the -issuer_checks option is set."
 msgstr ""
  
-#: ssl/state.c:326
+#: src/ssl/state.c:320
 msgid ""
 "The current candidate issuer certificate was rejected because its subject "
 "name did not match the issuer name of the current certificate. Only "
 "displayed when the -issuer_checks option is set."
 msgstr ""
  
-#: properties.c:263
+#: src/core/properties.c:237
 msgid "The delay between the host unlocking the keyboard and the actual unlock"
 msgstr ""
  
-#: dialog.c:241
-msgid "The file already exists. Replace it?"
+#: src/terminal/callbacks.c:462
+#, c-format
+msgid "The error code was %d"
 msgstr ""
  
-#: ftmessages.c:60 src/filetransfer/v3270ftprogress.c:76
+#: src/dialogs/save/save.c:455
+#, c-format
+msgid "The file \"%s\" already exists. Replace it?"
+msgstr ""
+
+#: src/core/ftmessages.c:60 src/filetransfer/v3270ftprogress.c:76
 msgid ""
 "The file transfer operation has been completed, and any record greater than "
 "the logical record length (LRECL) of the file being appended has been "
 "divided and becomes multiple records."
 msgstr ""
  
-#: ftmessages.c:53 src/filetransfer/v3270ftprogress.c:70
+#: src/core/ftmessages.c:53 src/filetransfer/v3270ftprogress.c:70
 msgid "The file transfer operation has been successfully completed."
 msgstr ""
  
-#: ftmessages.c:81 ftmessages.c:88 src/filetransfer/v3270ftprogress.c:94
-#: src/filetransfer/v3270ftprogress.c:100
+#: src/core/ftmessages.c:81 src/core/ftmessages.c:88
+#: src/filetransfer/v3270ftprogress.c:94 src/filetransfer/v3270ftprogress.c:100
 msgid ""
 "The host program has detected an error in the file data during a RECEIVE "
 "operation."
 msgstr ""
  
-#: ssl/state.c:262
+#: src/ssl/state.c:256
 msgid ""
 "The issuer certificate could not be found: this occurs if the issuer "
 "certificate of an untrusted certificate cannot be found."
 msgstr ""
  
-#: ssl/state.c:107
+#: src/ssl/state.c:101
 msgid ""
 "The issuer certificate of a looked up certificate could not be found. This "
 "normally means the list of trusted certificates is not complete."
@@ -2418,15 +2461,15 @@ msgstr &quot;&quot;
 msgid "The known types are %s"
 msgstr ""
  
-#: properties.c:214
+#: src/core/properties.c:269
 msgid "The model number"
 msgstr ""
  
-#: main.c:372
+#: main.c:308
 msgid "The model of 3270 display to be emulated"
 msgstr ""
  
-#: properties.c:362
+#: src/core/properties.c:389
 msgid "The name of the active LU"
 msgstr ""
  
@@ -2434,48 +2477,48 @@ msgstr &quot;&quot;
 msgid "The name of the file in the host"
 msgstr ""
  
-#: ssl/state.c:239
+#: src/ssl/state.c:233
 msgid ""
 "The passed certificate is self signed and the same certificate cannot be "
 "found in the list of trusted certificates."
 msgstr ""
  
-#: ssl/state.c:139
+#: src/ssl/state.c:133
 msgid ""
 "The public key in the certificate SubjectPublicKeyInfo could not be read."
 msgstr ""
  
-#: ft.c:277
+#: src/core/ft.c:278
 msgid "The remote file name is invalid."
 msgstr ""
  
-#: ssl/state.c:318
+#: src/ssl/state.c:312
 msgid "The root CA is marked to reject the specified purpose."
 msgstr ""
  
-#: ssl/state.c:310
+#: src/ssl/state.c:304
 msgid "The root CA is not marked as trusted for the specified purpose."
 msgstr ""
  
-#: ssl/state.c:248 ssl/negotiate.c:211
+#: src/ssl/state.c:242 src/ssl/negotiate.c:201
 msgid ""
 "The security certificate presented by this host was not issued by a trusted "
 "certificate authority."
 msgstr ""
  
-#: properties.c:432
+#: src/core/properties.c:459
 msgid "The security state"
 msgstr ""
  
-#: ssl/state.c:147 ssl/state.c:155
+#: src/ssl/state.c:141 src/ssl/state.c:149
 msgid "The signature of the certificate is invalid."
 msgstr ""
  
-#: ssl/state.c:302
+#: src/ssl/state.c:296
 msgid "The supplied certificate cannot be used for the specified purpose."
 msgstr ""
  
-#: ftmessages.c:146 src/filetransfer/v3270ftprogress.c:150
+#: src/core/ftmessages.c:146 src/filetransfer/v3270ftprogress.c:150
 msgid "There is not enough space available for data on the host."
 msgstr ""
  
@@ -2488,11 +2531,11 @@ msgstr &quot;&quot;
 msgid "There's no security information in the session"
 msgstr ""
  
-#: ftmessages.c:223 src/filetransfer/v3270ftprogress.c:216
+#: src/core/ftmessages.c:223 src/filetransfer/v3270ftprogress.c:216
 msgid "This is a host program error."
 msgstr ""
  
-#: dialog.c:480
+#: dialog.c:306
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -2509,7 +2552,7 @@ msgid &quot;&quot;
 "Franklin St, Fifth Floor, Boston, MA 02111-1307 USA"
 msgstr ""
  
-#: main.c:485
+#: main.c:418
 #, c-format
 msgid "This program requires GTK version %d.%d.%d"
 msgstr ""
@@ -2534,23 +2577,23 @@ msgstr &quot;&quot;
 msgid "Trace"
 msgstr ""
  
-#: toggles.c:99 98trace.xml:36
+#: src/core/toggles.c:100 98trace.xml:36
 msgid "Trace Data Stream"
 msgstr ""
  
-#: toggles.c:231 98trace.xml:40
+#: src/core/toggles.c:232 98trace.xml:40
 msgid "Trace SSL negotiation"
 msgstr ""
  
-#: toggles.c:123
+#: src/core/toggles.c:124
 msgid "Trace interface events"
 msgstr ""
  
-#: toggles.c:225 98trace.xml:38
+#: src/core/toggles.c:226 98trace.xml:38
 msgid "Trace network data flow"
 msgstr ""
  
-#: toggles.c:117 98trace.xml:37
+#: src/core/toggles.c:118 98trace.xml:37
 msgid "Trace screen contents"
 msgstr ""
  
@@ -2558,7 +2601,7 @@ msgstr &quot;&quot;
 msgid "Trace user interface events"
 msgstr ""
  
-#: toggles.c:93 00default.xml:117
+#: src/core/toggles.c:94 00default.xml:117
 msgid "Track Cursor"
 msgstr ""
  
@@ -2566,19 +2609,20 @@ msgstr &quot;&quot;
 msgid "Tracks"
 msgstr ""
  
-#: ft_cut.c:370
+#: src/core/ft_cut.c:371
 msgid "Transfer cancelled by host"
 msgstr ""
  
-#: ft_dft.c:233 ft_dft.c:376 ft_cut.c:399 ft_cut.c:494
+#: src/core/ft_dft.c:228 src/core/ft_dft.c:371 src/core/ft_cut.c:400
+#: src/core/ft_cut.c:495
 msgid "Transfer cancelled by user"
 msgstr ""
  
-#: ft.c:580
+#: src/core/ft.c:581
 msgid "Transfer complete"
 msgstr ""
  
-#: ft.c:585 src/filetransfer/worker.c:569
+#: src/core/ft.c:586 src/filetransfer/worker.c:569
 #: src/filetransfer/v3270ftprogress.c:720
 msgid "Transfer failed"
 msgstr ""
@@ -2600,7 +2644,7 @@ msgstr &quot;&quot;
 msgid "Transfer speed"
 msgstr ""
  
-#: ft_cut.c:463
+#: src/core/ft_cut.c:464
 msgid "Transmission error"
 msgstr ""
  
@@ -2612,59 +2656,71 @@ msgstr &quot;&quot;
 msgid "Turquoise"
 msgstr ""
  
-#: properties.c:418
+#: src/core/properties.c:445
 msgid "URL for the certificate revocation list"
 msgstr ""
  
-#: properties.c:369
+#: src/core/properties.c:396
 msgid "URL of the current host"
 msgstr ""
  
-#: dialog.c:64
+#: dialog.c:64 src/dialogs/save/save.c:71
 msgid "UTF-8"
 msgstr ""
  
-#: ft_dft.c:173
+#: src/core/ft_dft.c:168
 msgid "Uknown DFT Open type from host"
 msgstr ""
  
-#: ssl/state.c:138
+#: src/ssl/state.c:132
 msgid "Unable to decode issuer public key"
 msgstr ""
  
-#: ssl/state.c:130
+#: src/ssl/state.c:124
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
  
-#: ssl/state.c:122
+#: src/ssl/state.c:116
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
  
-#: ssl/state.c:114 ssl/negotiate.c:176
+#: src/ssl/state.c:108
 msgid "Unable to get certificate CRL."
 msgstr ""
  
-#: linux/connect.c:79
+#: src/core/linux/connect.c:81
 msgid "Unable to get connection state."
 msgstr ""
  
-#: ssl/state.c:106
+#: src/ssl/state.c:100
 msgid "Unable to get issuer certificate"
 msgstr ""
  
-#: ssl/state.c:261
+#: src/ssl/state.c:255
 msgid "Unable to get local issuer certificate"
 msgstr ""
  
-#: paste.c:336
+#: src/selection/linux/paste.c:114
+msgid "Unable to paste formatted data"
+msgstr ""
+
+#: src/core/paste.c:341
 msgid "Unable to paste text"
 msgstr ""
  
-#: ft.c:528
+#: src/core/session.c:198
+msgid "Unable to print"
+msgstr ""
+
+#: src/core/session.c:206
+msgid "Unable to save"
+msgstr ""
+
+#: src/core/ft.c:529
 msgid "Unable to send file-transfer request"
 msgstr ""
  
-#: ssl/state.c:269
+#: src/ssl/state.c:263
 msgid "Unable to verify the first certificate"
 msgstr ""
  
@@ -2677,72 +2733,82 @@ msgstr &quot;&quot;
 msgid "Unexpected action attribute in <%s>"
 msgstr ""
  
-#: paste.c:337
+#: src/core/paste.c:342
 msgid "Unexpected error"
 msgstr ""
  
+#: src/dialogs/save/save.c:440
+#, c-format
+msgid "Unexpected format %d"
+msgstr ""
+
 #: action.c:77
 #, c-format
 msgid "Unexpected group \"%s\""
 msgstr ""
  
-#: actions.c:576 actions.c:596
+#: src/dialogs/save/save.c:410
+#, c-format
+msgid "Unexpected mode %d"
+msgstr ""
+
+#: actions.c:547 actions.c:567
 #, c-format
 msgid "Unexpected or invalid %s attribute: \"%s\""
 msgstr ""
  
-#: ssl/linux/getcrl.c:559
+#: src/ssl/linux/getcrl.c:591
 msgid "Unexpected or invalid CRL URL"
 msgstr ""
  
-#: ssl/negotiate.c:224
+#: src/ssl/negotiate.c:178
 msgid "Unexpected or invalid TLS/SSL verify result"
 msgstr ""
  
-#: actions.c:550
+#: actions.c:521
 #, c-format
 msgid "Unexpected or invalid attribute value \"%s\""
 msgstr ""
  
-#: main.c:160
+#: main.c:148
 #, c-format
 msgid "Unexpected or invalid color value \"%s\""
 msgstr ""
  
-#: ssl/state.c:408
+#: src/ssl/state.c:406
 msgid "Unexpected or unknown security status"
 msgstr ""
  
-#: actions.c:466
+#: actions.c:437
 #, c-format
 msgid "Unexpected target \"%s\""
 msgstr ""
  
-#: kybd.c:290
+#: src/core/kybd.c:290
 #, c-format
 msgid "Unexpected type %d in typeahead queue"
 msgstr ""
  
-#: ctlr.c:756
+#: src/core/ctlr.c:780
 #, c-format
 msgid "Unknown 3270 Data Stream command: 0x%X"
 msgstr ""
  
-#: ft_cut.c:378
+#: src/core/ft_cut.c:379
 msgid "Unknown FT control code from host"
 msgstr ""
  
-#: kybd.c:2204
+#: src/core/kybd.c:2207
 #, c-format
 msgid "Unknown PA key %d"
 msgstr ""
  
-#: kybd.c:2219
+#: src/core/kybd.c:2222
 #, c-format
 msgid "Unknown PF key %d"
 msgstr ""
  
-#: ft_cut.c:302
+#: src/core/ft_cut.c:303
 msgid "Unknown frame type from host"
 msgstr ""
  
@@ -2751,15 +2817,19 @@ msgstr &quot;&quot;
 msgid "Unknown popup type \"%s\""
 msgstr ""
  
-#: rpq.c:228
+#: src/core/rpq.c:230
 msgid "Unsupported RPQ term"
 msgstr ""
  
-#: ssl/state.c:301
+#: src/ssl/state.c:295
 msgid "Unsupported certificate purpose"
 msgstr ""
  
-#: toggles.c:195 00default.xml:130
+#: src/dialogs/save/save.c:163
+msgid "Untitled document"
+msgstr ""
+
+#: src/core/toggles.c:196 00default.xml:130
 msgid "Use +/- for field navigation"
 msgstr ""
  
@@ -2767,7 +2837,7 @@ msgstr &quot;&quot;
 msgid "Use host default record format."
 msgstr ""
  
-#: toggles.c:196
+#: src/core/toggles.c:197
 msgid "Use the keys +/- from keypad to select editable fields"
 msgstr ""
  
@@ -2775,20 +2845,20 @@ msgstr &quot;&quot;
 msgid "Variable"
 msgstr ""
  
-#: dialog.c:500 dialog.c:502
+#: dialog.c:326 dialog.c:328
 #, c-format
 msgid "Version %s-%s"
 msgstr ""
  
-#: ft.c:537
+#: src/core/ft.c:538
 msgid "Waiting for GET response"
 msgstr ""
  
-#: ft.c:539
+#: src/core/ft.c:540
 msgid "Waiting for PUT response"
 msgstr ""
  
-#: dialog.c:65
+#: dialog.c:65 src/dialogs/save/save.c:72
 msgid "Western Europe (ISO 8859-1)"
 msgstr ""
  
@@ -2800,51 +2870,51 @@ msgstr &quot;&quot;
 msgid "Window"
 msgstr ""
  
-#: dialog.c:66
+#: dialog.c:66 src/dialogs/save/save.c:73
 msgid "Windows Western languages (CP1252)"
 msgstr ""
  
-#: src/terminal/oia.c:431 src/terminal/oia.c:455 src/terminal/oia.c:459
+#: src/terminal/oia.c:432 src/terminal/oia.c:456 src/terminal/oia.c:460
 msgid "X"
 msgstr ""
  
-#: src/terminal/oia.c:435
+#: src/terminal/oia.c:436
 msgid "X -f"
 msgstr ""
  
-#: src/terminal/oia.c:467
+#: src/terminal/oia.c:468
 msgid "X Connecting"
 msgstr ""
  
-#: src/terminal/oia.c:451
+#: src/terminal/oia.c:452
 msgid "X Inhibit"
 msgstr ""
  
-#: src/terminal/oia.c:427
+#: src/terminal/oia.c:428
 msgid "X Not Connected"
 msgstr ""
  
-#: src/terminal/oia.c:443
+#: src/terminal/oia.c:444
 msgid "X Numeric"
 msgstr ""
  
-#: src/terminal/oia.c:447
+#: src/terminal/oia.c:448
 msgid "X Overflow"
 msgstr ""
  
-#: src/terminal/oia.c:439
+#: src/terminal/oia.c:440
 msgid "X Protected"
 msgstr ""
  
-#: src/terminal/oia.c:463
+#: src/terminal/oia.c:464
 msgid "X Resolving"
 msgstr ""
  
-#: src/terminal/oia.c:415
+#: src/terminal/oia.c:416
 msgid "X System"
 msgstr ""
  
-#: src/terminal/oia.c:419
+#: src/terminal/oia.c:420
 msgid "X Wait"
 msgstr ""
  
@@ -2862,60 +2932,60 @@ msgstr &quot;&quot;
 msgid "You can't add more than one acitivity with the same files."
 msgstr ""
  
-#: ftmessages.c:74 src/filetransfer/v3270ftprogress.c:88
+#: src/core/ftmessages.c:74 src/filetransfer/v3270ftprogress.c:88
 msgid ""
 "You did not enter the required parameters after a SEND or RECEIVE command."
 msgstr ""
  
-#: ftmessages.c:195 src/filetransfer/v3270ftprogress.c:192
+#: src/core/ftmessages.c:195 src/filetransfer/v3270ftprogress.c:192
 msgid "You did not specify an existing CMS file for RECEIVE."
 msgstr ""
  
-#: ftmessages.c:95 src/filetransfer/v3270ftprogress.c:106
+#: src/core/ftmessages.c:95 src/filetransfer/v3270ftprogress.c:106
 msgid ""
 "You need 30 KB of main storage (not disk space) on the host for the file "
 "transfer, in addition to the host requirement."
 msgstr ""
  
-#: ftmessages.c:174 src/filetransfer/v3270ftprogress.c:174
+#: src/core/ftmessages.c:174 src/filetransfer/v3270ftprogress.c:174
 msgid ""
 "You selected an option that can only be used if SPACE is also specified."
 msgstr ""
  
-#: ftmessages.c:153 src/filetransfer/v3270ftprogress.c:156
+#: src/core/ftmessages.c:153 src/filetransfer/v3270ftprogress.c:156
 msgid ""
 "You selected an option that is either not recognized, is specified as a "
 "positional keyword, or has an associated value that is incorrect."
 msgstr ""
  
-#: ftmessages.c:181 src/filetransfer/v3270ftprogress.c:180
+#: src/core/ftmessages.c:181 src/filetransfer/v3270ftprogress.c:180
 msgid ""
 "You selected an option that is invalid with a host-partitioned data set."
 msgstr ""
  
-#: ftmessages.c:167 src/filetransfer/v3270ftprogress.c:168
+#: src/core/ftmessages.c:167 src/filetransfer/v3270ftprogress.c:168
 msgid ""
 "You selected an option that is not valid with APPEND, but otherwise may be "
 "used."
 msgstr ""
  
-#: ftmessages.c:160 src/filetransfer/v3270ftprogress.c:162
+#: src/core/ftmessages.c:160 src/filetransfer/v3270ftprogress.c:162
 msgid ""
 "You selected an option that is not valid with RECEIVE, but can be used with "
 "SEND."
 msgstr ""
  
-#: ftmessages.c:202 src/filetransfer/v3270ftprogress.c:198
+#: src/core/ftmessages.c:202 src/filetransfer/v3270ftprogress.c:198
 msgid ""
 "You specified a CMS file mode for the SEND key that does not allow write "
 "access."
 msgstr ""
  
-#: ftmessages.c:209 src/filetransfer/v3270ftprogress.c:204
+#: src/core/ftmessages.c:209 src/filetransfer/v3270ftprogress.c:204
 msgid "You specified a CMS file mode that is not in the CMS search order."
 msgstr ""
  
-#: ftmessages.c:139 src/filetransfer/v3270ftprogress.c:144
+#: src/core/ftmessages.c:139 src/filetransfer/v3270ftprogress.c:144
 msgid "You specified an option that is invalid."
 msgstr ""
  
@@ -2923,14 +2993,16 @@ msgstr &quot;&quot;
 msgid "_ASCII text"
 msgstr ""
  
+#: src/selection/linux/paste.c:82 src/selection/linux/paste.c:122
 #: src/dialogs/settingsdialog.c:410 src/dialogs/settingsdialog.c:429
 #: src/dialogs/commondialog.c:94 src/dialogs/commondialog.c:108
 #: src/dialogs/commondialog.c:125 src/dialogs/linux/select.c:49
-#: src/dialogs/linux/select.c:93
+#: src/dialogs/linux/select.c:93 src/dialogs/save/save.c:307
+#: src/dialogs/save/save.c:326
 msgid "_Cancel"
 msgstr ""
  
-#: src/trace/widget.c:449 src/dialogs/transfer.c:174 src/dialogs/transfer.c:194
+#: src/trace/widget.c:451 src/dialogs/transfer.c:174 src/dialogs/transfer.c:194
 #: src/dialogs/security.c:203
 msgid "_Close"
 msgstr ""
@@ -2951,10 +3023,14 @@ msgstr &quot;&quot;
 msgid "_Edit"
 msgstr ""
  
-#: src/trace/widget.c:441 00default.xml:34
+#: src/trace/widget.c:443 00default.xml:34
 msgid "_File"
 msgstr ""
  
+#: src/dialogs/save/save.c:203
+msgid "_Filename"
+msgstr ""
+
 #: print.c:421 src/dialogs/print/print.c:87
 msgid "_Font:"
 msgstr ""
@@ -2979,11 +3055,16 @@ msgstr &quot;&quot;
 msgid "_Options"
 msgstr ""
  
+#: src/selection/linux/paste.c:83 src/selection/linux/paste.c:123
+msgid "_Paste as text"
+msgstr ""
+
 #: src/filetransfer/v3270ft.c:342
 msgid "_Remote file"
 msgstr ""
  
-#: src/trace/widget.c:447
+#: src/trace/widget.c:449 src/dialogs/save/save.c:312
+#: src/dialogs/save/save.c:327
 msgid "_Save"
 msgstr ""
  
@@ -3024,46 +3105,38 @@ msgstr &quot;&quot;
 msgid "an action attribute"
 msgstr ""
  
-#: session.c:386
+#: src/core/session.c:409
 msgid "bracket"
 msgstr ""
  
-#: local/events.cc:163
-msgid "connected"
-msgstr ""
-
-#: toggles.c:333 linux/connect.c:228
+#: src/core/toggles.c:334 src/core/linux/connect.c:230
 msgid "disable"
 msgstr ""
  
-#: local/events.cc:163
-msgid "disconnected"
-msgstr ""
-
-#: toggles.c:333 linux/connect.c:228
+#: src/core/toggles.c:334 src/core/linux/connect.c:230
 msgid "enable"
 msgstr ""
  
-#: iocalls.c:562
+#: src/core/iocalls.c:565
 msgid "fcntl() error when getting socket state."
 msgstr ""
  
-#: iocalls.c:548
+#: src/core/iocalls.c:551
 msgid "ioctlsocket(FIONBIO) failed."
 msgstr ""
  
-#: properties.c:411
+#: src/core/properties.c:438
 msgid "lib3270 revision"
 msgstr ""
  
-#: properties.c:404
+#: src/core/properties.c:431
 msgid "lib3270 version"
 msgstr ""
  
-#: linux/connect.c:215
+#: src/core/linux/connect.c:217
 msgid "setsockopt(SO_OOBINLINE) has failed"
 msgstr ""
  
-#: dialog.c:541
+#: dialog.c:367
 msgid "translator-credits"
 msgstr ""
...	...	@@ -253,6 +253,8 @@ endif
253	253	locale: \
254	254	locale/$(PACKAGE_TARNAME).pot
255	255
	256	+ $(MAKE) -C locale all
	257	+
256	258	locale/$(PACKAGE_TARNAME).pot: \
257	259	$(POTDIR)/pw3270.pot \
258	260	$(POTDIR)/lib3270.pot \
...	...