5 files changed, 414 insertions, 73 deletions

diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index cface5d..2f3597b 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -1,132 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Escolher</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Vazio</translation>
+        <translation type="obsolete">Vazio</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Apelido</translation>
+        <translation type="obsolete">Apelido</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Ficheiro Como</translation>
+        <translation type="obsolete">Ficheiro Como</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>E-Mail</translation>
+        <translation type="obsolete">E-Mail</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Sexo</translation>
+        <translation type="obsolete">Sexo</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>Arrumar Campos</translation>
+        <translation type="obsolete">Arrumar Campos</translation>
     </message>
     <message>
         <source>Select the field order:</source>
-        <translation>Ordem dos campos:</translation>
+        <translation type="obsolete">Ordem dos campos:</translation>
     </message>
     <message>
         <source>Up</source>
-        <translation>Cima</translation>
+        <translation type="obsolete">Cima</translation>
     </message>
     <message>
         <source>Down</source>
-        <translation>Baixo</translation>
+        <translation type="obsolete">Baixo</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Enviar EMail</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Irradiar Entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Dados</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Arrumar Campos</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Sem Espaço</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">Não há espaço livre para
 guardar os ficheiros iniciais.
 
 Liberte algum espaço
 antes de introduzir dados!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
@@ -147,310 +147,350 @@ antes de introduzir dados!</translation>
         <translation>Contactos - Meus Dados</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Não há espaço para
 guardar os dados. 
 Liberte algum e tente de novo.
 
 Sair na mesma?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Escritório</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="obsolete">Mb</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Apelido</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Ficheiro Como</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-Mail Principal</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Fonte</translation>
+        <translation type="obsolete">Fonte</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation>Pequena</translation>
+        <translation type="obsolete">Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation>Normal</translation>
+        <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation>Grande</translation>
+        <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar cartão de visita</translation>
     </message>
     <message>
-        <source>Find Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>search pattern !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End of list</source>
+        <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End of list. Wrap around now.. !</source>
+        <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>List</source>
+        <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Phone Book</source>
+        <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Company Book</source>
+        <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Email Book</source>
+        <source>The selected File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cards</source>
+        <source>does not end with &quot;.vcf&quot; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to open it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>MyDialog1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal Wrap Around</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Font</source>
+        <translation type="unfinished">Fonte</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished">Pequena</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished">Normal</translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished">Grande</translation>
+    </message>
+    <message>
+        <source>Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Contact Order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="unfinished">Cima</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="unfinished">Baixo</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
-        <translation>E-Mail Principal</translation>
+        <translation type="obsolete">E-Mail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>E-Mails</translation>
+        <translation type="obsolete">E-Mails</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation type="unfinished">Empresa</translation>
+        <translation type="obsolete">Empresa</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Grupos</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organização</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Emprego</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Código Postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Inglaterra</translation>
@@ -1244,216 +1284,391 @@ is provided free !</source>
         <translation>Turquia</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrânia</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguai</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Juguslávia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zâmbia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax (Empresa)</translation>
+        <translation type="obsolete">Fax (Empresa)</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax (Pessoal)</translation>
+        <translation type="obsolete">Fax (Pessoal)</translation>
     </message>
     <message>
         <source>Business Phone</source>
-        <translation>Telefone (Empresa)</translation>
+        <translation type="obsolete">Telefone (Empresa)</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Telefone (Pessoal)</translation>
+        <translation type="obsolete">Telefone (Pessoal)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Telemóvel (Empresa)</translation>
+        <translation type="obsolete">Telemóvel (Empresa)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Telemóvel (Pessoal)</translation>
+        <translation type="obsolete">Telemóvel (Pessoal)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Site (Empresa)</translation>
+        <translation type="obsolete">Site (Empresa)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Site (Pessoal)</translation>
+        <translation type="obsolete">Site (Pessoal)</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Pager (Empresa)</translation>
+        <translation type="obsolete">Pager (Empresa)</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Rua (Empresa)</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Rua (Pessoal)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Cidade (Empresa)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Estado (Empresa)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Cód Postal (Empresa)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">País (Empresa)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Cidade (Pessoal)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Estado (Pessoal)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Cód. Postal (Pessoal)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">País (Pessoal)</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Departamento</translation>
+        <translation type="obsolete">Departamento</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Escritório</translation>
+        <translation type="obsolete">Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Profissão</translation>
+        <translation type="obsolete">Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Assistente</translation>
+        <translation type="obsolete">Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Chefe</translation>
+        <translation type="obsolete">Chefe</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Esposa</translation>
+        <translation type="obsolete">Esposa</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Alcunha</translation>
+        <translation type="obsolete">Alcunha</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Filhos</translation>
+        <translation type="obsolete">Filhos</translation>
     </message>
     <message>
         <source>Work Phone</source>
         <translation type="obsolete">Telefone (Empresa)</translation>
     </message>
     <message>
         <source>Work Fax</source>
         <translation type="obsolete">Fax (Empresa)</translation>
     </message>
     <message>
         <source>work Mobile</source>
         <translation type="obsolete">Telemóvel (Empresa)</translation>
     </message>
     <message>
         <source>Work Pager</source>
         <translation type="obsolete">Pager (Empresa)</translation>
     </message>
     <message>
         <source>Work Web Page</source>
         <translation type="obsolete">Site (Empresa)</translation>
     </message>
     <message>
         <source>Work Mobile</source>
         <translation type="obsolete">Telemóvel (Empresa)</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Apagar</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished">Telefone (Empresa)</translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished">Fax (Empresa)</translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished">Telemóvel (Empresa)</translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished">E-Mails</translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished">Telefone (Pessoal)</translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished">Fax (Pessoal)</translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished">Telemóvel (Pessoal)</translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">Escritório</translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished">Profissão</translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished">Assistente</translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished">Chefe</translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished">Esposa</translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished">Sexo</translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished">Nascimento</translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished">Aniversário</translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished">Alcunha</translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished">Filhos</translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished">Título</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished">Nome do Meio</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished">Apelido</translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished">Sufixo</translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished">Ficheiro Como</translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished">Título</translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished">Departamento</translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished">Empresa</translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished">Rua (Empresa)</translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished">Cidade (Empresa)</translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished">Estado (Empresa)</translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished">Cód Postal (Empresa)</translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished">País (Empresa)</translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished">Pager (Empresa)</translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished">Site (Empresa)</translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished">Rua (Pessoal)</translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished">Cidade (Pessoal)</translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished">Estado (Pessoal)</translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished">Cód. Postal (Pessoal)</translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished">País (Pessoal)</translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished">Site (Pessoal)</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished">Notas</translation>
+    </message>
+    <message>
+        <source>Groups</source>
+        <translation type="unfinished">Grupos</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index e2a040f..4d8d9f0 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -33,134 +33,130 @@
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>command failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Executar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
@@ -182,109 +178,113 @@ Do you really want to delete it?</source>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Output</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/keypebble.ts b/i18n/pt/keypebble.ts
index c5362ac..5ddff59 100644
--- a/i18n/pt/keypebble.ts
+++ b/i18n/pt/keypebble.ts
@@ -73,128 +73,136 @@ connection.</source>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Next Click is Double Click</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next Click is Right Click</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
diff --git a/i18n/pt/sysinfo.ts b/i18n/pt/sysinfo.ts
index 90f8090..b143fc7 100644
--- a/i18n/pt/sysinfo.ts
+++ b/i18n/pt/sysinfo.ts
@@ -1,184 +1,306 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>CPU - Aplicações (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>CPU - Systema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo:</translation>
     </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Total: %1 kB</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesDetail</name>
     <message>
         <source>Send</source>
         <translation type="unfinished">Enviar</translation>
     </message>
+    <message>
+        <source>Select a command here and then click the Send button to the right to send the command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this module.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the selected command to this module.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This is a list of all the kernel modules currently loaded on this handheld device.
+
+Click and hold on a module to see additional information about the module, or to unload it.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponível (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessDetail</name>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
+    <message>
+        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the selected signal to this process.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
+    <message>
+        <source>This is a list of all the processes on this handheld device.
+
+Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>Hard Disk</source>
-        <translation>Disco</translation>
+        <translation type="obsolete">Disco</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
-        <translation>Disco SCSI</translation>
+        <translation type="obsolete">Disco SCSI</translation>
     </message>
     <message>
         <source>Int. Storage</source>
-        <translation>Armazenamento Interno</translation>
+        <translation type="obsolete">Armazenamento Interno</translation>
+    </message>
+    <message>
+        <source>CF Card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hard Disk </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hard Disk /dev/hd </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SCSI Hard Disk /dev/sd </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Int. Storage </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Int. Storage /dev/mtdblock/ </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Int. Storage /dev/mtdblock </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info. Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Armazenamento</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel de Linux&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Compilado em:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/systemtime.ts b/i18n/pt/systemtime.ts
index 3f2fac5..09920a9 100644
--- a/i18n/pt/systemtime.ts
+++ b/i18n/pt/systemtime.ts
@@ -1,152 +1,144 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Ntp</name>
     <message>
         <source>time.fu-berlin.de</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You asked for a delay of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes, but only </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes elapsed since last lookup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rerun NTP?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predicted time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Get time from network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ntp error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time Shift:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predicted Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mean shift:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -207,85 +199,89 @@
     </message>
     <message>
         <source>Advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Set System Time</source>
         <translation type="obsolete">Hora do sistema</translation>
     </message>
     <message>
         <source>Time Zone</source>
         <translation>Fuso Horário</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time format</source>
         <translation>Formato da Hora</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 Horas</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 Horas</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Semana começa em</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Formato da data</translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation>Formato da Hora</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/D hh:mm</translation>
     </message>
+    <message>
+        <source>System Time</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuto</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
 </context>
 </TS>