Merge from BRANCH_1_0.

1 files changed, 226 insertions, 124 deletions

diff --git a/i18n/pt/mailit.ts b/i18n/pt/mailit.ts
index d61ee1d..5920ce5 100644
--- a/i18n/pt/mailit.ts
+++ b/i18n/pt/mailit.ts
@@ -1,531 +1,633 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Anexado</translation>
     </message>
     <message>
         <source>File type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de Ficheiro</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover</translation>
     </message>
     <message>
         <source>attach...</source>
-        <translation type="unfinished"></translation>
+        <translation>anexar...</translation>
+    </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation>A adicionar anexos</translation>
     </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Conta</translation>
     </message>
     <message>
         <source>Create new Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Criar conta Nova</translation>
     </message>
     <message>
         <source>Account name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome da Conta</translation>
     </message>
     <message>
         <source>Your name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Email</source>
-        <translation type="unfinished"></translation>
+        <translation>EMail</translation>
     </message>
     <message>
         <source>POP username</source>
-        <translation type="unfinished"></translation>
+        <translation>Conta POP</translation>
     </message>
     <message>
         <source>POP password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password POP</translation>
     </message>
     <message>
         <source>POP server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor POP</translation>
     </message>
     <message>
         <source>SMTP server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor SMTP</translation>
     </message>
     <message>
         <source>Synchronize</source>
-        <translation type="unfinished"></translation>
+        <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho (KB)</translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
-        <translation type="unfinished"></translation>
+        <translation>Inactivo</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>E&amp;Mail</translation>
     </message>
     <message>
         <source>Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation>Contas</translation>
     </message>
     <message>
         <source>Get Mail in</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter Correio de</translation>
     </message>
     <message>
         <source>Edit account</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Conta</translation>
     </message>
     <message>
         <source>Delete account</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar Conta</translation>
     </message>
     <message>
         <source>Send mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar EMail</translation>
     </message>
     <message>
         <source>Compose</source>
-        <translation type="unfinished"></translation>
+        <translation>Compôr</translation>
     </message>
     <message>
         <source>Cancel transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancelar Transferência</translation>
     </message>
     <message>
         <source>From</source>
-        <translation type="unfinished"></translation>
+        <translation>De</translation>
     </message>
     <message>
         <source>Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Assunto</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Inbox</source>
-        <translation type="unfinished"></translation>
+        <translation>Caixa Entrada</translation>
     </message>
     <message>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation>Para</translation>
     </message>
     <message>
         <source>Outbox</source>
-        <translation type="unfinished"></translation>
+        <translation>Caixa Saída</translation>
     </message>
     <message>
         <source>No account selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhuma conta selecionada</translation>
     </message>
     <message>
         <source>You must create an account</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem de criar uma conta</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de operações principal</translation>
     </message>
     <message>
         <source>getMail</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter Correio</translation>
     </message>
     <message>
         <source>select account</source>
-        <translation type="unfinished"></translation>
+        <translation>selecione a conta</translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique para obter o correio de todas as contas disponíveis.
+Clique e espere para seleccionar uma conta.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>No account associated</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem conta associada</translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Não existe nenhuma conta activa
+associada a este mail e portanto
+não poderá ser obtido</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Resposta desconhecida do servidor&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;servidor não encontrado&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;conexão recusada&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;erro na transmissão dos dados&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Autenticação falhou
+Verifique conta e palavra chave&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation>Erro ao receber</translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation>Ok
+</translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível localizar todos
+os ficheiros no correio com o assunto:</translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Falhou o envio do correio</translation>
     </message>
     <message>
         <source>Attachment error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro no anexo</translation>
     </message>
     <message>
         <source>OK
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Ok
+</translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Escrever Mail</translation>
     </message>
     <message>
         <source>Central view area</source>
-        <translation type="unfinished"></translation>
+        <translation>Área de vista central</translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Correio ainda não obtido</translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
-        <translation type="unfinished"></translation>
+        <translation>O correio que clicou ainda
+não foi obtido. Quer obtê-lo
+agora ?</translation>
+    </message>
+    <message>
+        <source>Mailit</source>
+        <translation>Mailit</translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation>Lêr Mail</translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação efectuada</translation>
     </message>
     <message>
         <source>Error Occured</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocorreu um Erro</translation>
     </message>
     <message>
         <source>Retrieving </source>
-        <translation type="unfinished"></translation>
+        <translation>A obter</translation>
     </message>
     <message>
         <source>Completing message </source>
-        <translation type="unfinished"></translation>
+        <translation>A completar a mensagem</translation>
     </message>
     <message>
         <source>No new Messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem mensagens Novas</translation>
     </message>
     <message>
         <source> new messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagens novas</translation>
     </message>
     <message>
         <source>No new messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem mensagens novas</translation>
+    </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation>Procura no DNS</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o assunto do correio aqui</translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza os destinatários do correio aqui</translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza outros destinatário para o correio aqui</translation>
     </message>
     <message>
         <source>Enter your mail text here</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o texto do correio aqui</translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
-        <translation type="unfinished"></translation>
+        <translation>Coloque este correio na caixa &quot;a enviar&quot; clicando aqui</translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Este é um resumo de todos os anexos do correio</translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é a vista da caixa de entrada.
+Ela mostra os mails obtidos que podem ser
+lidos se clicar duas vezes na entrada.
+A existencia de um icon azul revela a 
+existência de anexos.</translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é a vista da caixa de saída.
+Ela mostra os mails para saír que podem ser
+revistos se clicar duas vezes na entrada.
+</translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha os destinatários desta lista</translation>
+    </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation>Este botão dá acesso aos contactos disponíveis nos contactos do Opie</translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ver</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>E&amp;Mail</translation>
     </message>
     <message>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Anterior</translation>
     </message>
     <message>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Próxima</translation>
     </message>
     <message>
         <source>Attatchments</source>
-        <translation type="unfinished"></translation>
+        <translation>Anexos</translation>
     </message>
     <message>
         <source>Text Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato do Texto</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Reenviar</translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para reencaminhar o correio selecionado</translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Ler o correio anterior da lista</translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Ler o correio seguinte da lista</translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para adicionar anexos ao correio</translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
-        <translation type="unfinished"></translation>
+        <translation>Existem duas vistas para o correio:
+&lt;li&gt;&lt;b&gt;HTML&lt;/b&gt; mostra o mail como HTML&lt;/li&gt;&lt;li&gt;&lt;b&gt;Texto&lt;/b&gt; mostra o mail como texto&lt;/li&gt;Clique aqui para alternar entre os dois modos</translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para remover os correios selecionados</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter</translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para obter o correio selecionado</translation>
     </message>
     <message>
         <source>reply</source>
-        <translation type="unfinished"></translation>
+        <translation>responder</translation>
     </message>
     <message>
         <source>reply to mail</source>
-        <translation type="unfinished"></translation>
+        <translation>responder ao correio</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para responder ao correio selecionado
+Clique e espera para mais opções.</translation>
     </message>
     <message>
         <source>Reply all</source>
-        <translation type="unfinished"></translation>
+        <translation>Responder a Todos</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para responder a todos os destinatários do correio</translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
-        <translation type="unfinished"></translation>
+        <translation>À procura do nome do servidor</translation>
     </message>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligado</translation>
     </message>
     <message>
         <source>Sending: </source>
-        <translation type="unfinished"></translation>
+        <translation>A Enviar:</translation>
     </message>
     <message>
         <source>Sent </source>
-        <translation type="unfinished"></translation>
+        <translation>Enviado</translation>
     </message>
     <message>
         <source> messages</source>
-        <translation type="unfinished"></translation>
+        <translation>mensagens</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
-        <translation type="unfinished"></translation>
+        <translation>Instalar</translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para copiar os anexos para a pasta dos documentos</translation>
+    </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation>Navegar nos anexos</translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation>Anexos</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation>Instalado</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Não</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>E&amp;Mail</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Adicionar</translation>
     </message>
     <message>
         <source>Enque mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Correio a enviar</translation>
     </message>
     <message>
         <source>New mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo EMail</translation>
     </message>
     <message>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>Para:</translation>
     </message>
     <message>
         <source>CC:</source>
-        <translation type="unfinished"></translation>
+        <translation>CC:</translation>
     </message>
     <message>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>Assunto:</translation>
     </message>
     <message>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <source>Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Anexo</translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para anexar ficheiros ao seu correio</translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
-        <translation type="unfinished"></translation>
+        <translation>Este botão coloca o seu correio na caixa de saída</translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para criar um novo correio</translation>
     </message>
     <message>
         <source>No recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem destinatários</translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar o correio a quem?</translation>
     </message>
     <message>
         <source>OK
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Ok
+</translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Separador de destinatários incorrecto</translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Os destinatários deverão ser separados
+pelo caractér &quot;;&quot; e deverão ser endereços
+de correio válidos</translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Separador de CC incorrecto</translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Os destinatários em CC deverão ser separados
+pelo caractér &quot;;&quot; e deverão ser endereços
+de correio válidos</translation>
     </message>
     <message>
         <source>Re: </source>
-        <translation type="unfinished"></translation>
+        <translation>Re:</translation>
     </message>
     <message>
         <source>======forwarded message from </source>
-        <translation type="unfinished"></translation>
+        <translation>======mensagem reenviada de</translation>
     </message>
     <message>
         <source> starts======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>início=====
+
+</translation>
     </message>
     <message>
         <source>FWD: </source>
-        <translation type="unfinished"></translation>
+        <translation>FWD:</translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>======fim de mensagem reenviada======
+
+</translation>
     </message>
     <message>
         <source> wrote on </source>
-        <translation type="unfinished"></translation>
+        <translation>escrita em</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation>EMail</translation>
     </message>
 </context>
 </TS>