some changes suggested by H�ctor Garc�a �lvarez from Disoft

20 files changed, 1026 insertions, 126 deletions

diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 3975862..5c05a11 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -37,1301 +37,1341 @@
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Correo-e por omisión</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Organizando Campos</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Seleccione el orden de los campos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bajar</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>Nuevo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escribir correo a</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Emitir entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mis detalles personales</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Organizar campos</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation>No hay suficiente espacio para crear
 los ficheros iniciales.
 
 ¡Libere algo de espacio antes de
 introducir más datos!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar mis detalles personales</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Dirección</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Mis detalles personales</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Incapaz de guardar la información.
 Libere algo de espacio e
 inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Trabajo</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation>MB</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apellidos</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Correo-e por omisión</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeña</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar vCard</translation>
     </message>
+    <message>
+        <source>Find Next</source>
+        <translation>Buscar siguiente</translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation>Cerrar busqueda</translation>
+    </message>
+    <message>
+        <source>Save all Data</source>
+        <translation>Guardar datos</translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation>Configurar</translation>
+    </message>
+    <message>
+        <source>OContacts</source>
+        <translation>Contactos</translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation>Lista</translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation>Agenda telefónica</translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation>Agenda de la empresas</translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation>Agenda de correo-e</translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation>Tarjetas</translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation>Correo-e por omisión</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Correos-e</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>2º nombre</translation>
+        <translation>1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Apellidos</translation>
+        <translation>2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Compañía</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ciudad</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincia</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nombre completo...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organización</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Cód. postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Gran Bretaña</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japón</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemania</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introducir Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar nombre</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation>Afganistán</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Argelia</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Antillas</translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation>Antártida</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Armania</source>
         <translation>Armenia</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Acerballán</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
-        <translation type="unfinished"></translation>
+        <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
-        <translation type="unfinished"></translation>
+        <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Bélgica</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belice</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudas</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhután</translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation>Boliva</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Isla Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
-        <translation type="unfinished"></translation>
+        <translation>Brunei Darusalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgaria</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
-        <translation type="unfinished"></translation>
+        <translation>Camboya</translation>
     </message>
     <message>
         <source>Camaroon</source>
-        <translation type="unfinished"></translation>
+        <translation>Camerun</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cabo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Islas Caimán</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Isla de Navidad</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comodo</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Isla Cook</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
-        <translation type="unfinished"></translation>
+        <translation>Costa d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croacia</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Chipre</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Checoslovaquia</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dinamarca</translation>
     </message>
     <message>
         <source>Djibouti</source>
-        <translation type="unfinished"></translation>
+        <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
-        <translation type="unfinished"></translation>
+        <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>República Dominicama</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Oriental</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinea Ecuatorial</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopía</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Isla Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Islas Feroes</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlandia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guayana Francesa</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinesia Francesa</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabón</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gahna</source>
-        <translation type="unfinished"></translation>
+        <translation>Gahna</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guam</source>
-        <translation type="unfinished"></translation>
+        <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation>Guinea-bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guayana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
-        <translation type="unfinished"></translation>
+        <translation>El Vaticano</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hungría</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islandia</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italia</translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
-        <translation type="unfinished"></translation>
+        <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenia</translation>
     </message>
     <message>
         <source>Kribati</source>
-        <translation type="unfinished"></translation>
+        <translation>Kribati</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
-        <translation type="unfinished"></translation>
+        <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
-        <translation type="unfinished"></translation>
+        <translation>Lebanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
-        <translation type="unfinished"></translation>
+        <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituania</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macao</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedonia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malasia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malvinas</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinica</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauricio</translation>
     </message>
     <message>
         <source>Mayotte</source>
-        <translation type="unfinished"></translation>
+        <translation>Mayote</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronesia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldavia</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolia</translation>
     </message>
     <message>
         <source>Montserrat</source>
-        <translation type="unfinished"></translation>
+        <translation>Monserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marruecos</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
-        <translation type="unfinished"></translation>
+        <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
-        <translation type="unfinished"></translation>
+        <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Países Bajos</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nueva Caledonia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nueva Zelanda</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
-        <translation type="unfinished"></translation>
+        <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
-        <translation type="unfinished"></translation>
+        <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Omán</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistán</translation>
     </message>
     <message>
         <source>Palau</source>
-        <translation type="unfinished"></translation>
+        <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papúa Nueva Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Perú</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
         <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
+        <translation>Pitcairn</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polonia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
-        <translation type="unfinished"></translation>
+        <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumanía</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucía</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arabia Saudí</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leona</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Eslovaquia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Eslovenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Islas Solomon</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Sudáfrica</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>España</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Santa Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudán</translation>
     </message>
     <message>
         <source>Suriname</source>
-        <translation type="unfinished"></translation>
+        <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
-        <translation type="unfinished"></translation>
+        <translation>Swazilandia</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suecia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suiza</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailandia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
-        <translation type="unfinished"></translation>
+        <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Túnez</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquía</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
-        <translation type="unfinished"></translation>
+        <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrania</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
-        <translation type="unfinished"></translation>
+        <translation>Vanuatu</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>Islas Vírgenes</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yugoslavia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax negocio</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax casa</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tfno. negocio</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Teléfono casa</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Móvil negocio</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Móvil personal</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web negocio</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web personal</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Busca negocio</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Calle negocio</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Calle casa</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Ciudad trabajo</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Provincia trabajo</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Cód.postal trabajo</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País trabajo</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Cód.postal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>País casa</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Superior</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Cónyuge</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Hijos</translation>
     </message>
     <message>
         <source>Work Phone</source>
         <translation>Tfno. trabajo</translation>
     </message>
     <message>
         <source>Work Fax</source>
         <translation>Fax trabajo</translation>
     </message>
     <message>
         <source>work Mobile</source>
         <translation>Móvil trabajo</translation>
     </message>
     <message>
         <source>Work Pager</source>
         <translation>Busca trabajo</translation>
     </message>
     <message>
         <source>Work Web Page</source>
         <translation>Web trabajo</translation>
     </message>
     <message>
         <source>Work Mobile</source>
         <translation>Móvil trabajo</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
+        <translation>Kyrgystan</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index 71e27d7..ac5e918 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -1,264 +1,268 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar ficheros ocultos</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crear directorio</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Ejecutar comando</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Ejecutar comando con salida</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Pasar a local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Pasar a remoto</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Seguro que quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>No puedo renombrar</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ese directorio no existe</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copiar como</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Salida Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>¡el comando falló!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Emisión del Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envío IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type="obsolete">Cambiar directorio</translation>
+        <translation>Cambiar directorio</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Ejecutar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Abrir como texto</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Crear enlace simbólico</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info fichero</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Fijar permisos</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Emitir fichero</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>ya existe
 ¿seguro que quiere borrarlo?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Como</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar misma carpeta</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>No pude copiar
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>a
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>No puede mover
 </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>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL
 </translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Añadir a Documentos</translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation>Acciones</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar salida en fichero(sólo nombre)</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar Permisos Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos para el fichero:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lectura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escritura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecución</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index 822ad80..ae79dbf 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -54,247 +54,279 @@
     </message>
     <message>
         <source>Movies</source>
         <translation>Películas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Tarjeta crédito</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Trabajo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Miembro familiar</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Crédito misc</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pago automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Efectivo</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntryBase</name>
     <message>
         <source>Account Transaction</source>
         <translation>Transacción contable</translation>
     </message>
     <message>
         <source>$</source>
         <translation>$</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Cantidad:</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation>Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Diversión</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Películas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaje</translation>
     </message>
     <message>
         <source>Check Number:</source>
         <translation>Número cheque:</translation>
     </message>
     <message>
         <source>Extra Fee:</source>
         <translation>Cuota extra:</translation>
     </message>
     <message>
         <source>Additional Notes:</source>
         <translation>Notas adicionales:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Tarjeta crédito</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Payment</source>
         <translation>Pago</translation>
     </message>
 </context>
 <context>
     <name>QCheckGraphBase</name>
     <message>
         <source>Account Graph</source>
         <translation>Gráfico contable</translation>
     </message>
 </context>
 <context>
     <name>QCheckMMBase</name>
     <message>
         <source>Main Menu</source>
         <translation>Menú principal</translation>
     </message>
     <message>
         <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
         <translation>Seleccione una de las chequeras o pulse el icono &quot;Nuevo&quot; de la barra de herramientas.</translation>
     </message>
 </context>
 <context>
+    <name>QCheckMainMenu</name>
+    <message>
+        <source>Delete Account</source>
+        <translation>Borrar cuenta</translation>
+    </message>
+    <message>
+        <source>Really delete the
+</source>
+        <translation>¿Borrar realmente la</translation>
+    </message>
+    <message>
+        <source> account?</source>
+        <translation>cuenta?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Si</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Checkbook</source>
+        <translation>Chequera</translation>
+    </message>
+    <message>
+        <source>Could not remove account</source>
+        <translation>No pude borrar la cuenta</translation>
+    </message>
+</context>
+<context>
     <name>QCheckNameBase</name>
     <message>
         <source>Check Book Name</source>
         <translation>Nombre chequera</translation>
     </message>
     <message>
         <source>Name...</source>
         <translation>Nombre...</translation>
     </message>
     <message>
         <source>Please name your check book (limit: 15 characters):</source>
         <translation>Por favor, nombre su chequera (límite: 15 caracteres):</translation>
     </message>
     <message>
         <source>&amp;Done</source>
         <translation>&amp;Hecho</translation>
     </message>
 </context>
 <context>
     <name>QCheckViewBase</name>
     <message>
         <source>Account Transactions</source>
-        <translation>Transaccines contables</translation>
+        <translation>Transacciones contables</translation>
     </message>
     <message>
         <source>$0.00</source>
         <translation>0.00€</translation>
     </message>
     <message>
         <source>Balance:</source>
         <translation>Balance:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Hubo un problema creando
 la información de configuración
 para este programa.
 
 Por favor, libere algo de espacio
 e inténtelo de nuevo.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/citytime.ts b/i18n/es/citytime.ts
index 72e3700..0ebb6dc 100644
--- a/i18n/es/citytime.ts
+++ b/i18n/es/citytime.ts
@@ -1,51 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Cambiando hora</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Hubo problemas fijando la zona horaria %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Reestableciendo zona horaria</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Hubo problemas fijando su zona horaria. La hora puede ser incorrecta ahora...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Hora Mundial</translation>
     </message>
+    <message>
+        <source>Click on one of the set cities to replace it</source>
+        <translation>Pulse en una ciudad seleccionada para reemplazarla</translation>
+    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Ciudad</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>No encuentro información horaria</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Incapaz de encontrar ninguna información horaria en %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>No encuentro el mapa</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;No puedo cargar mapa: %1, saliendo</translation>
     </message>
+    <message>
+        <source>Continent</source>
+        <translation>Continente</translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation>Seleccione continente/pais, luego ciudad</translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation>Ciudad</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/embeddedkonsole.ts b/i18n/es/embeddedkonsole.ts
index d696fcf..a411aee 100644
--- a/i18n/es/embeddedkonsole.ts
+++ b/i18n/es/embeddedkonsole.ts
@@ -1,209 +1,209 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
-        <translation>&lt;B&gt;Lista de comandos&lt;/B&gt;:</translation>
+        <translation>&lt;B&gt;Comandos&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
         <translation>Impreso 1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Fija pequeña</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Fija media</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espacio</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abajo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Etiquetas abajo</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde sobre negro</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Negro sobre blanco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanco sobre negro</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Blanco sobre transparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Negro sobre rojo</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rojo sobre negro</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde sobre amarillo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul sobre magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sobre azul</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cian sobre blanco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanco sobre cian</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul sobre negro</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ámbar sobre negro</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Editar rápido</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra desp</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista comandos</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Añadir comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a añadir:</translation>
diff --git a/i18n/es/kpacman.ts b/i18n/es/kpacman.ts
index a0c9647..c10870e 100644
--- a/i18n/es/kpacman.ts
+++ b/i18n/es/kpacman.ts
@@ -43,232 +43,245 @@
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Ocultar cursor</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>Seleccionar &amp;esquema gráfico</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>Pa&amp;rar en segundo plano</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Continuar en primer plano</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Cambiar &amp;teclas...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Juego de pacman para KDE
 
 Programa basado en el código de ksnake
 de Michel Filippi (mfilippi@sade.rhein-main.de).
 Diseño fuertemente influenciado por pacman
 (c) 1980 MIDWAY MFG.CO.
 
 Quiero agradecer a mi novia Elke Krueers sus
 últimos 10 años de amistad.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
         <source>Configuration Error</source>
         <translation>Error de configuración</translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
         <translation>No hay esquemas definidos, o
 no seleccionó ningún esquema.</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>La fuente de bits no pudo construirse.
 
 El fichero &apos;@FONTNAME@&apos; no existe,
 o está en un formato desconocido.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>FIN DEL JUEGO</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>JUGADOR 1</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>¡PREPARADO!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>CARACTER</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>APODO</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SOMBRA</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;INTERMITENTE&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-RÁPIDO</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;MEÑIQUE&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-VERGONZOSO</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;TINTADO&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PULSE CURSOR PARA EMPEZAR</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>PUTUACIÓN MAX</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    ENHORABUENA      </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>   HA CONSEGUIDO    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation> UNA BUENA PUNTUACIÓN.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>CLAS   PUNTOS NOMBRE FECHA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>You&apos;re going to create the highscore-file
 &apos;%1&apos;
 for your maschine, that should be used systemwide.
 
 To grant access to the other users, set the appropriate rights (a+w)
 on that file or ask your systemadministator for that favor.
 
 To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
+        <translation>Va a generar el archivo de puntuaciones
+&apos;%1&apos;
+para su máquina, que debería usarse por todo el sistema.
+
+Para permitir el acceso a otros usuarios, ponga los permisos apropiados (a+w)
+en ese archivo o pida a su administrador que lo haga.
+
+Para usar un directorio o archivo diferente para las puntuaciones, especifíquelo en el archivo de configuración (kpacmanrc:highscoreFilePath).</translation>
     </message>
     <message>
         <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
 missing write-access to the systemwide file
 &apos;%1&apos; .
 
 Ask your systemadministrator for granting you access to that file,
 by setting the appropriate rights (a+w) on it.
 
 To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
+        <translation>Esta usando un archivo de puntuación privado, lo que suele ocurrir
+porque no tiene permiso de escritura en el archivo de puntuación global.
+
+Pida a su administrador de sistema que le dé acceso a ese archivo,
+fijando los permisos adecuados (a+w).
+
+Para usar un directorio o archivo diferente para las puntuaciones, especifíquelo en el archivo de configuración (kpacmanrc:highscoreFilePath).</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source>                          </source>
         <translation>                          </translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>La fuente de bits no pudo construirse.
 
 El fichero &apos;@PIXMAPNAME@&apos; no existe,
 o está en un formato desconocido.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Error al iniciar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libliquid.ts b/i18n/es/libliquid.ts
index 56c7a93..473753e 100644
--- a/i18n/es/libliquid.ts
+++ b/i18n/es/libliquid.ts
@@ -1,85 +1,85 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation>Estilo Líquido</translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation>Sin transparencias</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation>Punteado, color de fondo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation>Punteado, color de botón</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation>Punteado translúcido, color de fondo</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation>Punteado translúcido, color de botón</translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation>Transparencia propia</translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation>Color del menú</translation>
     </message>
     <message>
         <source>Text color</source>
         <translation>Color del texto</translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation>Opacidad</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation>Usar texto del menú sombreado</translation>
     </message>
     <message>
         <source>Draw liquid window title bars</source>
-        <translation type="obsolete">Barra título ventana líquida</translation>
+        <translation>Barra título ventana líquida</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation>Botones planos en barra herramientas</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation>Puntear contraste</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Liquid</source>
         <comment>name</comment>
-        <translation type="obsolete">Líquido</translation>
+        <translation>Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <comment>description</comment>
-        <translation type="obsolete">Estilo Líquido de alto rendimiento por Mosfet</translation>
+        <translation>Estilo Líquido de alto rendimiento por Mosfet</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation>Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation>Estilo Líquido de alto rendimiento por Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libmetal.ts b/i18n/es/libmetal.ts
index 217c33c..609fd8e 100644
--- a/i18n/es/libmetal.ts
+++ b/i18n/es/libmetal.ts
@@ -1,22 +1,22 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Metal</source>
         <comment>name</comment>
-        <translation type="obsolete">Metal</translation>
+        <translation>Metal</translation>
     </message>
     <message>
         <source>Metal style</source>
         <comment>description</comment>
-        <translation type="obsolete">Estilo Metal</translation>
+        <translation>Estilo Metálico</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation>Metal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopie.ts b/i18n/es/libopie.ts
index 852a69c..096023a 100644
--- a/i18n/es/libopie.ts
+++ b/i18n/es/libopie.ts
@@ -15,194 +15,458 @@
     <message>
         <source>Hue:</source>
         <translation>Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Canal alpha:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Seleccionar color</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>DiálogoFichero</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos ficheros</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Salvar</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Tipo mime</translation>
     </message>
     <message>
         <source>Ser Permission</source>
         <translation>Fijar permisos</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Seguro que quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Mediano</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeño</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>El Rápido Zorro Marrón Saltó Por Encima Del Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation>Tomar Hora</translation>
     </message>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Tomar hora:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
         <translation>Sumario:</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fecha tope:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
+    <message>
+        <source>Alarmed Notification:</source>
+        <translation>Notificación de alarma:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Email Addresses: </source>
+        <translation>Correo-e: </translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation>Teléfono casa: </translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation>Fax casa: </translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation>Móvil personal: </translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation>Web personal: </translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation>Web negocio: </translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation>Oficina: </translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation>Teléfono negocio: </translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation>Fax negocio: </translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation>Móvil negocio: </translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation>Busca negocio: </translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation>Profesión: </translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation>Ayudante: </translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation>Superior: </translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>Hombre</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>Mujer</translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation>Género: </translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation>Cónyuge: </translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation>Cumpleaños: </translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation>Aniversario: </translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation>Apodo: </translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation>Título</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation>1º apellido</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation>2º apellido</translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation>Sufijo</translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation>Guardar como</translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation>Cargo</translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation>Departamento</translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation>Compañía</translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation>Teléfono negocio</translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation>Fax negocio</translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation>Móvil negocio</translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation>Correo-e preferido</translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation>Correos-e</translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation>Teléfono casa</translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation>Fax casa</translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation>Móvil casa</translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation>Calle negocio</translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation>Ciudad negocio</translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation>Provincia negocio</translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation>Cód.postal negocio</translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation>País negocio</translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation>Busca negocio</translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation>Web negocio</translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation>Oficina</translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation>Profesión</translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation>Ayudante</translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation>Superior</translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation>Calle casa</translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation>Ciudad casa</translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation>Provincia casa</translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation>Cód.postal casa</translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation>País casa</translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation>Web personal</translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation>Cónyuge</translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation>Género</translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation>Cumpleaños</translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation>Aniversario</translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation>Apodo</translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation>Hijos</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Groups</source>
+        <translation>Grupos</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index 279ce55..753f75c 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -1,527 +1,527 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Negocios</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nueva categoría</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nueva categoría</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Editar categoría</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorías</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicación</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Aquí van las categorías</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Verificar las categorías a las que pertenece este documento.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Introduzca una nueva categoría aquí. Pulse &lt;b&gt;Añadir&lt;/b&gt; para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Introduzca una nueva categoría a la izquierda y pulse para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pulse para borrar la categoría resaltada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Verificar que esta propiedad está disponible en todas las aplicaciones.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Lo siento, otra aplicación está
 editando las categorías.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar categorías</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostar Enero del año seleccionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostar el mes anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostar el mes siguiente</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostar Diciembre del año seleccionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>View</source>
-        <translation type="obsolete">Ver</translation>
+        <translation>Ver</translation>
     </message>
     <message>
         <source>Create a new Document</source>
-        <translation type="obsolete">Crear nuevo documento</translation>
+        <translation>Crear nuevo documento</translation>
     </message>
     <message>
         <source>Close the File Selector</source>
         <translation>Cerrar selección fichero</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostar documentos de este tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostar documentos de esta categoría</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Pulse para seleccionar un documento de la lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, o selecione &lt;b&gt;Nuevo dcumento&lt;/b&gt; para crearlo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Mantenga pulsado para las propiedades del documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>There are no files in this directory.</source>
-        <translation type="obsolete">No hay ficheros en este directorio.</translation>
+        <translation>No hay ficheros en este directorio.</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Cadena no encontrada.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Final alcanzado, empezando por el principio</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Qué buscar:</translation>
     </message>
     <message>
         <source>&amp;Find</source>
-        <translation type="obsolete">&amp;Buscar</translation>
+        <translation>&amp;Buscar</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Iniciar búsqueda el:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dic 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Buscar hacia atrás</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Falló al borrar fichero.</translation>
     </message>
     <message>
         <source>Delete Icon and leave file</source>
-        <translation type="obsolete">Borrar icono y dejar fichero</translation>
+        <translation>Borrar icono y dejar fichero</translation>
     </message>
     <message>
         <source>Icon deletion failed.</source>
-        <translation type="obsolete">Fallo al borrar icono.</translation>
+        <translation>Fallo al borrar icono.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copiar de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fallo al copiar fichero.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Fallo al mover documento.</translation>
     </message>
     <message>
         <source>File does not exist.</source>
-        <translation type="obsolete">El fichero no existe.</translation>
+        <translation>El fichero no existe.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentario:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localización:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Carga rápida (consume memoria)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Del Icon</source>
-        <translation type="obsolete">Borrar icono</translation>
+        <translation>Borrar icono</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>El medio en el que reside el documento.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>El nombre de este documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Precargar esta aplicación para disponibilidad instantánea.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Borrar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Hacer una copia de este documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Emitir este documento a otro dispositivo.</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Información del propietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</source>
         <translation>Impreso1</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introduzca código</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Hubo un problema creando
 la información de configuración
 de este programa.
 
 Por favor, libere espacio e
 inténtelo de nuevo.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Incapaz de crear ficheros de inicio.
 Por favor, libere espacio antes
 de introducir datos</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e intételo de nuevo.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>día</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mes</translation>
     </message>
     <message>
         <source>year</source>
         <translation>año</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
diff --git a/i18n/es/libtheme.ts b/i18n/es/libtheme.ts
index 25c63df..4bfe5a2 100644
--- a/i18n/es/libtheme.ts
+++ b/i18n/es/libtheme.ts
@@ -1,49 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Themed style</source>
         <comment>name</comment>
-        <translation type="obsolete">Estilo del tema</translation>
+        <translation>Estilo del tema</translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <comment>description</comment>
-        <translation type="obsolete">Motor de estilos compatible con temas KDE2</translation>
+        <translation>Motor de estilos compatible con temas KDE2</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation>Estilo del tema</translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation>Motor de estilos compatible con temas KDE2</translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation>Estilo del Tema</translation>
     </message>
     <message>
         <source>Select the theme to be used</source>
         <translation>Seleccione el tema que usará</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>[No theme]</source>
         <translation>[Sin tema]</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/mail.ts b/i18n/es/mail.ts
index a521b7b..0cae042 100644
--- a/i18n/es/mail.ts
+++ b/i18n/es/mail.ts
@@ -1,905 +1,906 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountEditor</name>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>&lt;p&gt;Your signature is longer than 4 lines. This is considered inpolite by many people. You should shorten your signature.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Su firma es mayor de 4 líneas. Estos es considerado descortés por mucha gente. Debería recortar su firma.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Cambiar</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
 </context>
 <context>
     <name>AccountEditorBase</name>
     <message>
         <source>Account Editor</source>
         <translation>Editar cuenta</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <source>&lt;b&gt;Port:</source>
         <translation>&lt;p&gt;Puerto:</translation>
     </message>
     <message>
         <source>&lt;b&gt;IMAP:</source>
         <translation>&lt;b&gt;IMAP:</translation>
     </message>
     <message>
         <source>[--]</source>
         <translation>[--]</translation>
     </message>
     <message>
         <source>&lt;b&gt;SMTP:</source>
         <translation>&lt;b&gt;SMTP:</translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation>&lt;b&gt;Usuario:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
-        <translation>&lt;b&gt;Calve:</translation>
+        <translation>&lt;b&gt;Clave:</translation>
     </message>
     <message>
         <source>Identity</source>
         <translation>Identidad</translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation>&lt;b&gt;Nombre:</translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation>&lt;b&gt;Correo-e:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation>&lt;b&gt;Org:</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
         <source>Reply-To</source>
         <translation>Responder a</translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation>&lt;b&gt;Firma:</translation>
     </message>
     <message>
         <source>SSL</source>
         <translation>SSL</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>Use SSL</source>
         <translation>Usar SSL</translation>
     </message>
     <message>
         <source>993</source>
         <translation>993</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
         <translation>No hay entradas en la libreta de direcciones.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiene que seleccionar al menos una dirección.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
         <translation>Recoge direcciones</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation>Por favor, seleccione una entrada primero.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation>Fijar descripción</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation>&lt;div align=center&gt;Descripción</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiene que especificar un destinatario.&lt;br&gt;(pe: pepe@luis.es)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Hubo un problema enviando algún correo de la cola.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation>&lt;p&gt;El correo fue puesto con éxito en la cola.&lt;/p&gt;&lt;p&gt;La cola contiene</translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation>correos.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation>&lt;font color=#ff0000&gt;Ocurrió un error durante el envío.&lt;/font&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation>&lt;p&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El correo fue enviando con éxito.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation>&lt;p&gt;Los correos en cola </translation>
     </message>
     <message>
         <source> of </source>
         <translation>de </translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation>Componer mensaje</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation>Enviar correo</translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation>Correo en cola</translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation>Adjuntar un fichero</translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation>Libreta direcciones</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Responder</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation>Asto.</translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation>Prio.</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation>Añadir un adjunto</translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation>Eliminar adjunto</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation>Carbiar descripción</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tiene que seleccionar una cuenta primero.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Pregunta</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Seguro que quiere borrar la cuenta seleccionada?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Accounts</source>
-        <translation>Cuantas</translation>
+        <translation>Cuentas</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>[Hidden]</source>
         <translation>[Oculto]</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Mail notification</source>
         <translation>Notificación de correo</translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation>Parpadeo LED</translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation>Tocar sonido</translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
-        <translation>&lt;b&gt;Comprobar&amp;tal cada</translation>
+        <translation>&lt;b&gt;Comprobar&amp;nbsp;cada</translation>
     </message>
     <message>
         <source> min</source>
-        <translation>min</translation>
+        <translation> min</translation>
     </message>
     <message>
         <source>Disable mail notification</source>
         <translation>Desactivar notificación correo</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
         <translation>&lt;p&gt;&lt;b&gt;Mail(Correo) versión %1&lt;/b&gt;&lt;hr&gt;
 Patrocinado y programado por LISAsystems&lt;br&gt;
-Visite http://www.lisa.de/ para informarse.</translation>
+Visite http://www.lisa.de/ para informarse.
+                            </translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation>Crear carpeta</translation>
     </message>
     <message>
         <source>Rescan folder list</source>
         <translation>Releer lista carpetas</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an item first.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Por favor, seleccione un elemento primero.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Pregunta</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete &lt;pre&gt;%1&lt;/pre&gt;?</source>
         <translation>&lt;p&gt;¿Seguro que quiere borrar &lt;pre&gt;%1&lt;/pre&gt;?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Foldername</source>
         <translation>Nombre carpeta</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter the name of the new folder.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Por favor, introduzca el nombre de la nueva carpeta.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Looking up host...</source>
         <translation>Buscando máquina...</translation>
     </message>
     <message>
         <source>Host found.</source>
         <translation>Máquina encontrada.</translation>
     </message>
     <message>
         <source>Connected to host.</source>
         <translation>Conectado al servidor.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The IMAP connection was refused.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La conexión IMAP fue rehusada.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The host was not found.&lt;/p&gt;</source>
         <translation>&lt;p&gt;No encontré la máquina.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was an error while reading from the socket.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Hubo un problema al leer el socket.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Login failed. Check your password/username.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Falló la identificación. Verifique su nombre/clave.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unknown error was encountered.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ha ocurrido un error desconocido.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Disconnected.</source>
         <translation>Desconectado.</translation>
     </message>
     <message>
         <source>Login successfull!</source>
         <translation>¡Identificado con éxito!</translation>
     </message>
     <message>
         <source>&lt;p&gt;Login failed. Go away.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Falló la identificación. Lárgate.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Renaming successfull!</source>
         <translation>¡Renombrado con éxito!</translation>
     </message>
     <message>
         <source>&lt;p&gt;Renaming failed. (Server said: %1)&lt;/p&gt;</source>
         <translation>&lt;p&gt;Renombrado fallido. (El servidor dijo: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Deletion successfull!</source>
         <translation>¡Borrado con éxito!</translation>
     </message>
     <message>
         <source>&lt;p&gt;Delete failed. (Server said: %1)&lt;/p&gt;</source>
         <translation>&lt;p&gt;Borrado fallido. (El servidor dijo: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Folder created. Rescanning...</source>
         <translation>Carpeta creada. Releyendo...</translation>
     </message>
     <message>
         <source>&lt;p&gt;The folder could not be created. (Server said: %1)&lt;/p&gt;</source>
         <translation>&lt;p&gt;La carpeta no pudo crearse. (El servidor dijo: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t open folder cache file for writing!&lt;/p&gt;</source>
         <translation>&lt;p&gt;¡No pude escribir en el fichero cache de carpeta!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Got folder list.</source>
         <translation>Tengo la lista de carpetas.</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t retrieve the folder list. (Server said: %1)&lt;/p&gt;</source>
         <translation>&lt;p&gt;No pude recuperar la lista de carpetas. (El servidor dijo: %1)&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>MailTable</name>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Asunto</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Seen</source>
         <translation>Leído</translation>
     </message>
     <message>
         <source>Unseen</source>
         <translation>No leído</translation>
     </message>
     <message>
         <source>Marked</source>
         <translation>Marcado</translation>
     </message>
     <message>
         <source>Unmarked</source>
         <translation>Desmarcado</translation>
     </message>
     <message>
         <source>Mark as...</source>
         <translation>Marcar como...</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Borrar correo</translation>
     </message>
     <message>
         <source>Mailbox contained no mails.</source>
         <translation>Buzón sin correos.</translation>
     </message>
     <message>
         <source>Getting mail headers...</source>
         <translation>Trayendo cabeceras...</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;An error occoured during the selection of the mailbox. (Server said: %1)&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ocurrió un error al seleccionar el buzón. (El servidor dijo: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Stopped</source>
         <translation>Atascado</translation>
     </message>
     <message>
         <source>Got all mail headers.</source>
         <translation>Cabeceras obtenidadas.</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Couldn&apos;t fetch mail.</source>
         <translation>&lt;font color=#ff0000&gt;No pude sacar el correo.</translation>
     </message>
 </context>
 <context>
     <name>MainWindowBase</name>
     <message>
         <source>E-Mail</source>
         <translation>Correo-e</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servidores</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Componer nuevo correo</translation>
     </message>
     <message>
         <source>Send queued mails</source>
         <translation>Enviar correo en cola</translation>
     </message>
     <message>
         <source>Show/hide folders</source>
         <translation>Mostar/ocultar carpetas</translation>
     </message>
     <message>
         <source>Search mails</source>
         <translation>Buscar correos</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
 </context>
 <context>
     <name>OpenDiagBase</name>
     <message>
         <source>Open file...</source>
         <translation>Abrir fichero...</translation>
     </message>
     <message>
         <source> Stop </source>
-        <translation>Parar</translation>
+        <translation> Parar </translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; kB of &lt;b&gt;%2&lt;/b&gt; kB at &lt;b&gt;%3&lt;/b&gt; kB/s</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; kB de &lt;b&gt;%2&lt;/b&gt; kB a &lt;b&gt;%3&lt;/b&gt; kB/s</translation>
     </message>
     <message>
         <source>[Icon]</source>
         <translation>[Icono]</translation>
     </message>
     <message>
         <source>&lt;i&gt;application/v-card</source>
         <translation>&lt;i&gt;application/v-card</translation>
     </message>
     <message>
         <source>Open using an application</source>
         <translation>Abir usando una aplicación</translation>
     </message>
     <message>
         <source>Save to disk</source>
         <translation>Guardar en disco</translation>
     </message>
     <message>
         <source>Display</source>
         <translation>Mostrar</translation>
     </message>
     <message>
         <source>Save to</source>
         <translation>Guardar en</translation>
     </message>
     <message>
         <source>RAM</source>
         <translation>RAM</translation>
     </message>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>(no name)</source>
         <translation>(sin nombre)</translation>
     </message>
     <message>
         <source>&lt;Foldertree not known.&gt;</source>
         <translation>&lt;Árbol de carpetas desconocido.&gt;</translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation>Entrante</translation>
     </message>
     <message>
         <source>(no from)</source>
         <translation>(sin remite)</translation>
     </message>
     <message>
         <source>(no subject)</source>
         <translation>(sin asunto)</translation>
     </message>
     <message>
         <source>(no date)</source>
         <translation>(sin fecha)</translation>
     </message>
 </context>
 <context>
     <name>RenameBase</name>
     <message>
         <source>Renaming</source>
         <translation>Renombrando</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Renaming</source>
         <translation>&lt;div align=center&gt;Renombrando</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;to</source>
         <translation>&lt;div align=center&gt;a</translation>
     </message>
 </context>
 <context>
     <name>SearchDiag</name>
     <message>
         <source>Body</source>
         <translation>Cuerpo</translation>
     </message>
     <message>
         <source>Header Field</source>
         <translation>Campo de cabecera</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Asunto</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter what to search for.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Por favor, introduzca qué buscar.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a folder.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Por favor, seleccione una carpeta.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter a header field to search in.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Por favor, introduzca una campo de cabecera en que buscar.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not select the folder. Aborting. (Server said: %1)</source>
         <translation>&lt;p&gt;No pude seleccionar una carpeta. Abortando. (El servidor dijo: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
     <message>
         <source>&lt;p&gt;No mails match your criteria.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ningún correo coincide con su criterio.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Search failed. (Server said: %1)</source>
         <translation>&lt;p&gt;Búsqueda fallida. (El servidor dijo: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t fetch the mail headers. (Server said: %1)</source>
         <translation>&lt;p&gt;No pude traer las cebeceras del correo. (El servidor dijo: %1)&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>SearchDiagBase</name>
     <message>
         <source>Mail Search</source>
         <translation>Búsqueda correo</translation>
     </message>
     <message>
         <source>&lt;b&gt;Search&amp;nbsp;in:</source>
-        <translation>&lt;b&gt;Búsqueda&amp;tal en:</translation>
+        <translation>&lt;b&gt;Búsqueda&amp;nbsp;en:</translation>
     </message>
     <message>
         <source>&lt;b&gt;For:</source>
         <translation>&lt;b&gt;Para:</translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;From:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;To:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Date:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</source>
         <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;De:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;Para:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Fecha:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</translation>
     </message>
     <message>
         <source>(no subject)</source>
         <translation>(sin asunto)</translation>
     </message>
     <message>
         <source>(no from)</source>
         <translation>(sin remite)</translation>
     </message>
     <message>
         <source>(no recipient)</source>
         <translation>(sin destinatario)</translation>
     </message>
     <message>
         <source>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</source>
         <translation>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Bcc:&lt;/b&gt; %1&lt;br&gt;</source>
         <translation>&lt;b&gt;Bcc:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
         <source>(no date)</source>
         <translation>(sin fecha)</translation>
     </message>
     <message>
         <source>Getting mail body from server. Please wait...</source>
         <translation>Obteniendo cuerpo del correo del servidor. Por favor, espere...</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation>&lt;p&gt;El cuerpo del correo no está descargado todavía, por tanto no puede contestar aún.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation>&lt;p&gt;El cuerpo del correo no está descargado todavía, por tanto no puede reenviarlo aún.</translation>
     </message>
     <message>
         <source>&lt;p&gt;I was unable to retrieve the mail from the server. You can try again later or give up.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Incapaz de recuperar el correo del servidor. Puede intentarlo más tarde o renunciar.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
         <translation>Correo-e por %1</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Responder</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Reenviar</translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation>Adjuntos</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Borrar correo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/oxygen.ts b/i18n/es/oxygen.ts
index 9c463d2..ea21748 100644
--- a/i18n/es/oxygen.ts
+++ b/i18n/es/oxygen.ts
@@ -1,154 +1,154 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculations</source>
-        <translation type="obsolete">Cálculos</translation>
+        <translation>Cálculos</translation>
     </message>
     <message>
         <source>Molweight</source>
-        <translation type="obsolete">Peso molecular</translation>
+        <translation>Peso molecular</translation>
     </message>
     <message>
         <source>Formula:</source>
-        <translation type="obsolete">Fórmula:</translation>
+        <translation>Fórmula:</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Calcular</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Result:</source>
-        <translation type="obsolete">Resultado:</translation>
+        <translation>Resultado:</translation>
     </message>
     <message>
         <source>Elemental composition (%):</source>
-        <translation type="obsolete">Composición elemental (%):</translation>
+        <translation>Composición elemental (%):</translation>
     </message>
     <message>
         <source>Nernst</source>
-        <translation type="obsolete">Nernst</translation>
+        <translation>Nernst</translation>
     </message>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso molecular</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Fórmula química</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso molecular (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composición elemental (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Bloque</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electronegatividad</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Radio atómico</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Energía ionización</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densidad</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Punto ebullición</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Punto fusión</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation>%1 nm</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Cálculos</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Sistema Periódico</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>ERROR: 
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Datos Químicos</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index 62815e5..76fe914 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,17 +1,276 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation>Problema en la aplicación</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Pulse las crucecitas firmemente y con
+precisión para calibrar la pantalla.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Bienvenido a Opie</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation>Documentos</translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation>Ver como iconos</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation>Ver como lista</translation>
+    </message>
+</context>
+<context>
+    <name>Desktop</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Estado de la batería</translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!&quot;nKeep power off until power restored!</source>
+        <translation>¡El nivel de la batería es crítico!&quot;n¡Apágueme o enchúfeme!</translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation>La batería está muy baja.</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation>¡El nivel de la batería es crítico!
+¡Apágueme o enchúfeme!</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation>La batería de respaldo está muy baja.
+Por favor cárguela.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation>tarjeta de visita</translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Estado de la Batería</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation>Lanzador</translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation> - Lanzador</translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation>Sin aplicación</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation>&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation>%1 ficheros</translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation>Todos los tipos de ficheros</translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation>Ver como documentos</translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation>Medio insertado</translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media file?</source>
+        <translation>Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation>Qué ficheros</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Audio</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation>Imagen</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation>Texto</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Vídeo</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Todos</translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation>Enlace a aplicaciones</translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation>Limitar búsqueda al directorio: (no se usa aún)</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Añadir</translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation>Su decisión será guardada en el medio.</translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation>No preguntar otra vez por este medio</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation>Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation>Apagar...</translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation>Terminar</translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation>Terminar Opie</translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation>Reiniciar</translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation>Reiniciar Opie</translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system In a normal environment, these concepts are unnecessary.</source>
+        <translation>&lt;p&gt;
+Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation>&lt;p&gt;
+Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation>Conexión de sincronización</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you ae using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation>&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Denegar</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you hve just initiated a Sync for the first time, this is normal.</source>
+        <translation>&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Permitir</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation>&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation>&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sincronizando</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sheetqt.ts b/i18n/es/sheetqt.ts
index 097ec92..b87d88c 100644
--- a/i18n/es/sheetqt.ts
+++ b/i18n/es/sheetqt.ts
@@ -558,268 +558,289 @@
     <message>
         <source>Cosine</source>
         <translation>Coseno</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
         <translation>&amp;Coseno</translation>
     </message>
     <message>
         <source>ArcCosine</source>
         <translation>Arco coseno</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
         <translation>Arco cos&amp;eno</translation>
     </message>
     <message>
         <source>Tangent</source>
         <translation>Tangente</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation>&amp;Tangente</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation>Arco tangente</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation>Arco tan&amp;gente</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation>Arco tangente de coordenadas</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation>Arco tangente co&amp;or</translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation>Exponencial</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation>&amp;Exponencial</translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation>Logaritmo</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation>&amp;Logaritmo</translation>
     </message>
     <message>
         <source>Power</source>
         <translation>Potencia</translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation>&amp;Potencia</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation>&amp;Matemática</translation>
     </message>
     <message>
         <source>Average</source>
         <translation>Media</translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation>Medi&amp;a</translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation>Máximo</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation>Má&amp;ximo</translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation>Mínimo</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation>&amp;Mínimo</translation>
     </message>
     <message>
         <source>Count</source>
         <translation>Contador</translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation>&amp;Contador</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation>E&amp;stadístico</translation>
     </message>
     <message>
         <source>Functions</source>
         <translation>Funciones</translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation>¡No encontré la ayuda!</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.1
 Release Date: July 04, 2002
 
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
         <translation>Opie Sheet
 Hoja de Cálculo de Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Desarrollado por: Serdar Ozler
 Versión 1.0.1
 Fecha: 04 julio 2002
 
 Este producto está bajo licencia GPL. Es de libre distribución. Si quiere la última versión y el código fuente, por favor visite el sitio web.
 
 http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
         <translation>&amp;Número de filas:</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation>&amp;Número de columnas:</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation>&amp;Número de hojas:</translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation>Hoja</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation>&amp;Altura de cada fila:</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation>A&amp;nchura de cada columna:</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation>&amp;Nombre hoja:</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation>¡Sólo hay una hoja!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>¿Está seguro?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>&amp;Tipo</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation>Mover cel&amp;dillas abajo</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation>Move&amp;r celdillas derecha</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation>Toda la &amp;fila</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation>Toda la &amp;columna</translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation>Opie Sheet
+Hoja de cálculo para Opie
+QWDC Beta Winner (como Sheet/Qt)
+
+Desarrollado por: Serdar Ozler
+Versión 1.0.2
+Fecha: 08 de octubre de 2002
+</translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation>¡Error sintáctico!</translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation>¡Búsqueda no encotrada!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation>&amp;Ordenar</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>O&amp;pciones</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation>&amp;Ordenar por</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation>&amp;Luego por</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation>Luego &amp;por</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Distinguir may/min</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation>Di&amp;rección</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation>&amp;Bajando (filas)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation>De iqz a dch (&amp;columnas)</translation>
     </message>
     <message>
         <source>Sort</source>
         <translation>Ordenar</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation>&amp;Ascendente</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation>&amp;Descendente</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation>¡Una celdilla no puedo ser ordenada!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sound.ts b/i18n/es/sound.ts
index 8f728f1..0879991 100644
--- a/i18n/es/sound.ts
+++ b/i18n/es/sound.ts
@@ -1,132 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
         <source>Shows icon</source>
         <translation>Mostrar icono</translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation>Ocultar icono</translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>Vmemo Settings</source>
         <translation>Configuración de Vmemo</translation>
     </message>
     <message>
         <source>8000</source>
         <translation>8000</translation>
     </message>
     <message>
         <source>11025</source>
         <translation>11025</translation>
     </message>
     <message>
         <source>22050</source>
         <translation>22050</translation>
     </message>
     <message>
         <source>33075</source>
         <translation>33075</translation>
     </message>
     <message>
         <source>44100</source>
         <translation>44100</translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation>Estéreo</translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation>16 bit</translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation>Alertas visuales</translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation>Icono Barra Tareas</translation>
     </message>
     <message>
         <source>Key_Escape</source>
-        <translation type="obsolete">Tecla_Escape</translation>
+        <translation>Tecla_Escape</translation>
     </message>
     <message>
         <source>Key_Space</source>
         <translation>Tecla_Espacio</translation>
     </message>
     <message>
         <source>Key_Home</source>
         <translation>Tecla_Inicio</translation>
     </message>
     <message>
         <source>Key_Calender</source>
         <translation>Tecla_Calendario</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Tecla_Contactos</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Tecla_Menú</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Tecla_Correo</translation>
     </message>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Tasa muestreo:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Carpeta grabación:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Tecla grabación:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Límite grabación en segundos:</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Sin límite</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Reiniciar Opie si es preciso</translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation>Tecla_Grabación</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index 95612e6..ae0aaf8 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -1,310 +1,332 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation>Editar Textos</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>Fallo al escribir</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Sin nombre</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor Textos</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Elegir letra</translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation>¿Realmente quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
 del dico?&lt;BR&gt;¡Es &lt;B&gt;irreversible!&lt;/B&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>Text Edit tiene copyright&lt;BR&gt;2000 Trolltech AS, y&lt;BR&gt;2002 &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;, y está bajo licencia GPL</translation>
     </message>
+    <message>
+        <source>Advanced Features</source>
+        <translation>Opciones avanzadas</translation>
+    </message>
+    <message>
+        <source>Prompt on Exit</source>
+        <translation>Preguntar al salir</translation>
+    </message>
+    <message>
+        <source>Always open linked file</source>
+        <translation>Abrir siempre fichero enlazado</translation>
+    </message>
+    <message>
+        <source>File Permissions</source>
+        <translation>Permisos fichero</translation>
+    </message>
+    <message>
+        <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;
+file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
+        <translation>El editor de texto ha detectado que&lt;BR&gt;ha seleccionado un fichero&lt;B&gt;.desktop&lt;/B&gt;.
+&lt;BR&gt;¿Abro el fichero &lt;B&gt;.desktop&lt;/B&gt; o su &lt;B&gt;enlace&lt;/B&gt;?</translation>
+    </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>FontDialog</source>
-        <translation type="obsolete">DiálogoLetra</translation>
+        <translation>DiálogoLetra</translation>
     </message>
     <message>
         <source>Font Dialog</source>
-        <translation type="obsolete">Diálogo de Letra</translation>
+        <translation>Diálogo de Letra</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
+        <translation>Tamaño</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="obsolete">Letra</translation>
+        <translation>Letra</translation>
     </message>
     <message>
         <source>Font Style</source>
-        <translation type="obsolete">Estilo de letra</translation>
+        <translation>Estilo de letra</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">El Rápido Zorro Marrón Saltó Por Encima Del Perro Perezoso</translation>
+        <translation>El Rápido Zorro Marrón Saltó Por Encima Del Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Guardar como</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Buscar...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Acercar</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Alejar</translation>
     </message>
     <message>
         <source>Bold</source>
-        <translation type="obsolete">Negrilla</translation>
+        <translation>Negrilla</translation>
     </message>
     <message>
         <source>Italic</source>
-        <translation type="obsolete">Cursiva</translation>
+        <translation>Cursiva</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Empezar con Nuevo</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar Buscar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor Textos</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>Fichero .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Documento enlazado</translation>
     </message>
     <message>
         <source>Unnamed</source>
-        <translation type="obsolete">Sin nombre</translation>
+        <translation>Sin nombre</translation>
     </message>
     <message>
         <source>Permissions</source>
-        <translation type="obsolete">Permisos</translation>
+        <translation>Permisos</translation>
     </message>
     <message>
         <source>FontDialog</source>
-        <translation type="obsolete">DiálogoLetras</translation>
+        <translation>DiálogoLetras</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="obsolete">Sí</translation>
+        <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="obsolete">No</translation>
+        <translation>No</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Insertar hora y fecha</translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation>Funciones avanzadas</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
-        <translation type="obsolete">El Editor de Textos ha detectado que&lt;BR&gt;ha seleccionado un fichero &lt;B&gt;.desktop&lt;/B&gt;.&lt;BR&gt;¿Abro &lt;B&gt;.desktop&lt;/B&gt; o el fichero que &lt;B&gt;enlaza&lt;/B&gt;?</translation>
+        <translation>El Editor de Textos ha detectado que&lt;BR&gt;ha seleccionado un fichero &lt;B&gt;.desktop&lt;/B&gt;.&lt;BR&gt;¿Abro &lt;B&gt;.desktop&lt;/B&gt; o el fichero que &lt;B&gt;enlaza&lt;/B&gt;?</translation>
     </message>
     <message>
         <source>Text Edit</source>
-        <translation type="obsolete">Editar Textos</translation>
+        <translation>Editar Textos</translation>
     </message>
     <message>
         <source>Write Failed</source>
-        <translation type="obsolete">Fallo al escribir</translation>
+        <translation>Fallo al escribir</translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete">¿Realmente quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
+        <translation>¿Realmente quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
 del dico?&lt;BR&gt;¡Es &lt;B&gt;irreversible!&lt;/B&gt;</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation type="obsolete">Text Edit tiene copyright&lt;BR&gt;2000 Trolltech AS, y&lt;BR&gt;2002 &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;, y está bajo licencia GPL</translation>
+        <translation>Text Edit tiene copyright&lt;BR&gt;2000 Trolltech AS, y&lt;BR&gt;2002 &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;, y está bajo licencia GPL</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fije los Permisos del Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos fichero para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>leer</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escribir</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Error - sin usuario</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Error - sin grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Error fijando propietario o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permisos fichero</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index 577d9d0..a0a52a0 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -1,178 +1,210 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Pertenece a </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor, rellene su información personal</translation>
     </message>
     <message>
         <source>No appointments today</source>
-        <translation type="obsolete">No hay citas para hoy</translation>
+        <translation>No hay citas para hoy</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt; correos nuevos, &lt;b&gt;%2&lt;/b&gt; salientes</translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; correos nuevos, &lt;b&gt;%2&lt;/b&gt; salientes</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete">Hay &lt;b&gt; 1&lt;/b&gt; tarea pendiente: &lt;br&gt;</translation>
+        <translation>Hay &lt;b&gt; 1&lt;/b&gt; tarea pendiente: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete">Hay &lt;b&gt; %1 &lt;/b&gt; tareas pendientes: &lt;br&gt;</translation>
+        <translation>Hay &lt;b&gt; %1 &lt;/b&gt; tareas pendientes: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
-        <translation type="obsolete">No hay tareas pendientes</translation>
+        <translation>No hay tareas pendientes</translation>
     </message>
     <message>
         <source>No more appointments today</source>
-        <translation type="obsolete">No hay más citas para hoy</translation>
+        <translation>No hay más citas para hoy</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>No encontré módulos</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Ningún módulo activado</translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation>Piche aquí para lanzar la aplicación asociada</translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Hoy</translation>
+        <translation>Hoy</translation>
     </message>
     <message>
         <source>Opiemail not installed</source>
-        <translation type="obsolete">Opiemail no está instalado</translation>
+        <translation>Opiemail no está instalado</translation>
+    </message>
+    <message>
+        <source>Today by Maximilian Rei</source>
+        <translation>Hoy por Maximilian Rei</translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
-        <translation>Hoy²</translation>
+        <source>Click here to get to the config dialog</source>
+        <translation>Pinche aquí para obtener el diálogo de configuración</translation>
+    </message>
+    <message>
+        <source>Today by Maximilian Rei&#xffffffdf;</source>
+        <translation>Hoy por Maximilian Rei&#xffffffdf;</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation>Configuración de Hoy</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Cargar qué módulos en qué orden:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mover arriba</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mover abajo</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>activa/orden</translation>
     </message>
     <message>
-        <source>autostart on 
+        <source>autostart on
 resume?
  (Opie only)</source>
         <translation>arrancar al
 encender?
 (sólo Opie)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutos inactivo</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation>Marque una casilla para activar/desactivar un plugin o use las flechas de la derecha para cambiar el orden de aparición</translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation>Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation>Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
+    </message>
+    <message>
+        <source>Icon size</source>
+        <translation>Tamaño del icono</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation>Fijar el tamaño del icono en pixel</translation>
+    </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
-        <translation type="obsolete">Configuración de Hoy</translation>
+        <translation>Configuración de Hoy</translation>
     </message>
     <message>
-        <source>Should the 
-location 
+        <source>Should the
+location
 be shown?</source>
-        <translation type="obsolete">¿Debo mostrar el
+        <translation>¿Debo mostrar el
 lugar de las citas?</translation>
     </message>
     <message>
-        <source>Should the notes 
+        <source>Should the notes
 be shown?</source>
-        <translation type="obsolete">¿Debo mostrar las
+        <translation>¿Debo mostrar las
 notas de las citas?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
-        <translation type="obsolete">Mostrar únicamente
+        <translation>Mostrar únicamente
 las citas futuras</translation>
     </message>
     <message>
-        <source>How many 
+        <source>How many
 appointment
 should
 be shown?</source>
-        <translation type="obsolete">¿Cuantas citas 
+        <translation>¿Cuántas citas
 debo mostrar?</translation>
     </message>
     <message>
         <source>Calendar</source>
-        <translation type="obsolete">Calendario</translation>
+        <translation>Calendario</translation>
     </message>
     <message>
         <source>How many
-tasks should 
+tasks should
 be shown?</source>
-        <translation type="obsolete">¿Cuantas tareas
+        <translation>¿Cuantas tareas
 debo mostrar?</translation>
     </message>
     <message>
         <source>Tasks</source>
-        <translation type="obsolete">Tareas </translation>
+        <translation>Tareas </translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
-        <translation type="obsolete">Saltar de línea tras
+        <translation>Saltar de línea tras
 cuántas letras</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
-        <translation type="obsolete">¿Arrancar Hoy
+        <translation>¿Arrancar Hoy
 al encender?
 (sólo Opie)</translation>
     </message>
     <message>
-        <source>Activate the  
+        <source>Activate the
 autostart after how
 many minutes?</source>
-        <translation type="obsolete">¿Activar Hoy tras
+        <translation>¿Activar Hoy tras
 cuántos minutos
 apagado?</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="obsolete">Varios</translation>
+        <translation>Varios</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index f51ddf4..539595e 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -1,224 +1,420 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>MainWindow</name>
+    <message>
+        <source>New Task</source>
+        <translation>Nueva tarea</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation>Editar tarea</translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation>Ver tarea</translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation>Eliminar...</translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation>Borrar todo...</translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation>Borrado completado</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation>Duplicar</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation>Emitir</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Buscar</translation>
+    </message>
+    <message>
+        <source>Completed tasks</source>
+        <translation>Tareas completadas</translation>
+    </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation>Mostrar fecha lí­mite</translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation>Datos</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation>Categorí­a</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opciones</translation>
+    </message>
+    <message>
+        <source>Show over due</source>
+        <translation>Mostrar fuera de plazo</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>New from template</source>
+        <translation>Nuevo desde plantilla</translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation>Todas</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation>Sin espacio</translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation>Tareas fue incapaz de
+salvar sus cambios.
+Libere algo de espacio
+e inténtelo de nuevo.
+
+¿Salir de todas formas?</translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation>Tareas</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation>No puedo editar datos, estoy sincronizando</translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation>¿todas las tareas?</translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation>¿todas las tareas completadas?</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation>En blanco</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation>&lt;P&gt;Han llegado %1 nuevas tareas.&lt;p&gt;¿Desea añadirlas a su lista de tareas?</translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation>Nuevas tareas</translation>
+    </message>
+</context>
+<context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
-        <translation>Lista de tareas</translation>
+        <translation>Lista tareas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation>Nueva Tarea</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Sumario:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation>&amp;Completada</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation>&amp;Límite</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation>1 Ene 2001</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation>1 - Muy alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation>2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation>3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation>4 - Baja</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation>5 - Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>0%</source>
         <translation>0%</translation>
     </message>
     <message>
         <source>20%</source>
         <translation>20%</translation>
     </message>
     <message>
         <source>40%</source>
         <translation>40%</translation>
     </message>
     <message>
         <source>60%</source>
         <translation>60%</translation>
     </message>
     <message>
         <source>80%</source>
         <translation>80%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>100%</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Edit Task</source>
+        <translation>Editar Tarea</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>C.</source>
+        <translation>C.</translation>
+    </message>
+    <message>
+        <source>Prior.</source>
+        <translation>Prior.</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation>Descripción</translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation>Fecha lí­mite</translation>
+    </message>
+    <message>
+        <source>Table View</source>
+        <translation>Vista de tablas</translation>
+    </message>
+    <message>
+        <source> day(s)</source>
+        <translation> día(s)</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ninguna</translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation>Editor de plantillas</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Añadir</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Editar</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eliminar</translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation>Nueva plantilla %1</translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation>Configurar Platillas</translation>
+    </message>
+</context>
+<context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation>Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha límite</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation>Incapaz de crear ficheros
 iniciales. Libere espacio antes
 de introducir algún dato</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>Nueva tarea</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editar tarea</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Eliminar...</translation>
+        <translation>Borrar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>Borrar todo...</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation>Tareas completadas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation>Mostrar fecha límite</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Incapaz de salvar sus
 datos. Libere algo de
 espacio e inténtelo
 de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>all tasks</source>
         <translation>todas las tareas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/wordgame.ts b/i18n/es/wordgame.ts
index f489b2c..13e0395 100644
--- a/i18n/es/wordgame.ts
+++ b/i18n/es/wordgame.ts
@@ -1,137 +1,137 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Board</name>
     <message>
         <source>Blanks: </source>
         <translation>En blanco:</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Unknown word</source>
         <translation>Palabra desconocida</translation>
     </message>
     <message>
         <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
         <translation>&lt;p&gt;La palabra &quot;%1&quot; no está en el diccionario.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
 </context>
 <context>
     <name>NewGameBase</name>
     <message>
         <source>Form1</source>
         <translation>Impreso1</translation>
     </message>
     <message>
         <source>Players</source>
         <translation>Jugadores</translation>
     </message>
     <message>
         <source>AI3: Smart AI player</source>
         <translation>AI3: Jugador artificial</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Reglas</translation>
     </message>
     <message>
         <source>&amp;Start</source>
-        <translation>&amp;Empazar</translation>
+        <translation>&amp;Empezar</translation>
     </message>
 </context>
 <context>
     <name>RulesBase</name>
     <message>
         <source>Game Rules</source>
         <translation>Reglas del juego</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Board</source>
         <translation>Tablero</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Tamaño:</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>ScoreInfo</name>
     <message>
         <source>&lt;P&gt;Invalid move</source>
         <translation>&lt;P&gt;Movimiento no válido</translation>
     </message>
     <message>
         <source>&lt;P&gt;Score: </source>
         <translation>&lt;P&gt;Puntuación:</translation>
     </message>
 </context>
 <context>
     <name>WordGame</name>
     <message>
         <source>Word Game</source>
         <translation>Crucigrama</translation>
     </message>
     <message>
         <source>Back</source>
         <translation>Atrás</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Listo</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
         <source>End game</source>
         <translation>Fin juego</translation>
     </message>
     <message>
         <source>Do you want to end the game early?</source>
         <translation>¿Quieres acabar ya?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 </TS>