50 files changed, 3418 insertions, 182 deletions

diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 4271ed1..c6bf2d1 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -1,1514 +1,1514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nombre Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Elige</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 datos personales</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 datos personales</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Dirección</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Mis Datos 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>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar vCard</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>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Tarjetas</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>No Encontrado</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Tarjeta</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Iniciar búsqueda</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>¿Tipo fichero correcto?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sí</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>¡Incapaz de encontrar un contacto
 con ese patrón de búsqueda!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>El fichero seleccionado
 no termina en &quot;.vcf&quot;.
 ¿Seguro que quiere abrirlo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>¿Añadir contacto?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>¿Seguro que quiere añadir el contacto para 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Sí a &amp;todo</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exportar vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>¡Tiene que seleccionar un contacto!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>¡Tiene que elegir un nombre de fichero!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Estilo consulta</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usar expresiones regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar comodines (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Prefiere QT-Mail </translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Prefiere Opie-Mail</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Configuración de Búsqueda</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>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Aviso: QT-Mail sólo se
 suministra en la Rom de
 SHARP. ¡Opie-Mail se
 suministra gratis!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Orden</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Seleccionar orden de contactos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bajar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Pulse tab para seleccionar uno</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Configuración del estilo de búsqueda</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>El botón de búsqueda espera una expresión regular al selecionarse</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>El botón de búsqueda espera sólo comodines simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Si lo selecciona, la búsqueda diferencia entre mayúsculas y minúsculas</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Tamaño de letra para la vista en lista y tarjetas</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Configuración de letras para la vista en lista y tarjetas</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Use la aplicación de correo de Sharp si está disponible</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Use el correo de OPIE si está instalado</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Sube los atributos seleccionados una línea</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Baja los atributos seleccionados una línea</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista de todos los atributos disponibles</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Añade el atributo seleccionado de la lista inferior a la lista superior</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Borra el atributo seleccionado de la lista superior</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Orden (arriba-&gt;abajo) que define el contacto principal que se muestra el la segunda columna en la vista en lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Herramienta-/Barra de menú</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Arreglado</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>¡Cambie entre menu fijo-/barra de herramientas después de reiniciar la aplicación!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Movible</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>¡Cambie a menú-/barra de herramientas después de reiniciar la aplicación!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <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>Archivar como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</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...</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ódigo 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>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>Argentina</source>
         <translation>Argentina</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>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <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>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Isla Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <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>Camboya</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>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>Isla Cook</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <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>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <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>Isla Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <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>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>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guayana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <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>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenia</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Lebanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <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>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>Monserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marruecos</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <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>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <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>Palau</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>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>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>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <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>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>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <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>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <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>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</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>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afganistán</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antártida</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Camerún</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Ginea-Bisau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Islas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pulse para introducir nombre y apellidos</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>¡Introduzca el nombre completo directamente! Si los apellidos son varias palabras, por favor, escriba &lt;apellidos&gt;, &lt;nombres&gt; como en &quot;Fernández Barros, José Luis&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>El cargo..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Algo como &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>El lugar de trabajo del contacto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pulse para seleccional el atributo a cambiar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pulse para seleccionar cómo almacenar el nombre (y cómo mostrarlo el la vista en lista)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Tfno. trabajo</translation>
+        <translation type="obsolete">Tfno. trabajo</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax trabajo</translation>
+        <translation type="obsolete">Fax trabajo</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Móvil trabajo</translation>
+        <translation type="obsolete">Móvil trabajo</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Correo-e</translation>
+        <translation type="obsolete">Correo-e</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Correos-e</translation>
+        <translation type="obsolete">Correos-e</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Teléfono casa</translation>
+        <translation type="obsolete">Teléfono casa</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax casa</translation>
+        <translation type="obsolete">Fax casa</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Móvil personal</translation>
+        <translation type="obsolete">Móvil personal</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Oficina</translation>
+        <translation type="obsolete">Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Profesión</translation>
+        <translation type="obsolete">Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Ayudante</translation>
+        <translation type="obsolete">Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Superior</translation>
+        <translation type="obsolete">Superior</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Cónyuge</translation>
+        <translation type="obsolete">Cónyuge</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Género</translation>
+        <translation type="obsolete">Género</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Cumpleaños</translation>
+        <translation type="obsolete">Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Aniversario</translation>
+        <translation type="obsolete">Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Apodo</translation>
+        <translation type="obsolete">Apodo</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Hijos</translation>
+        <translation type="obsolete">Hijos</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nombre</translation>
+        <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>1º apellido</translation>
+        <translation type="obsolete">1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>2º apellido</translation>
+        <translation type="obsolete">2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Sufijo</translation>
+        <translation type="obsolete">Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Archivar como</translation>
+        <translation type="obsolete">Archivar como</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Cargo</translation>
+        <translation type="obsolete">Cargo</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Departamento</translation>
+        <translation type="obsolete">Departamento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Compañía</translation>
+        <translation type="obsolete">Compañía</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Calle trabajo</translation>
+        <translation type="obsolete">Calle trabajo</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Ciudad trabajo</translation>
+        <translation type="obsolete">Ciudad trabajo</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Provincia trabajo</translation>
+        <translation type="obsolete">Provincia trabajo</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Cód.postal trabajo</translation>
+        <translation type="obsolete">Cód.postal trabajo</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>País trabajo</translation>
+        <translation type="obsolete">País trabajo</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Busca trabajo</translation>
+        <translation type="obsolete">Busca trabajo</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Web trabajo</translation>
+        <translation type="obsolete">Web trabajo</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Calle casa</translation>
+        <translation type="obsolete">Calle casa</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Ciudad casa</translation>
+        <translation type="obsolete">Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Provincia casa</translation>
+        <translation type="obsolete">Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Cód.postal casa</translation>
+        <translation type="obsolete">Cód.postal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>País casa</translation>
+        <translation type="obsolete">País casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Web personal</translation>
+        <translation type="obsolete">Web personal</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index 4e17ec5..8ca2067 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -1,394 +1,401 @@
 <!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 type="obsolete">Pasar a local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="obsolete">Pasar a remoto</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>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>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>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>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>Add To Documents</source>
         <translation>Añadir a Documentos</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>¿Confirma el borrado
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>¿Borrar directorio?</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation>¿Confirma la copia
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>¡El fichero existe!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 existe. ¿Lo sobrescribo?</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>%1 exists. Ok to overwrite?</source>
         <translation>%1 existe. ¿Lo sobreescribo?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>No pude copiar %1 a %2</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation>Advanced FileManager
 copyright 2002-2003 por
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 y está bajo licencia GPL
 </translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Directorio de favoritos</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Borrar el directorio actual de los favoritos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>No pude borrar el directorio actual
 de los favoritos.
 ¡No está marcado como favorito!</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Buscar archivo</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>¿Seguro que quiere borrar %1
 y todo su contenido?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>¿Confirma el borrado
 de %1?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished">Gestor de Ficheros Avanzado :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"> kB libres</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">Copiar &quot;%1&quot; como</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></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>
     <message>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>El proceso no pudo empezar</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Error
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Finalizado
 </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>
     <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>filePermissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 533e6d0..ca3a4f3 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -1,285 +1,285 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Configurar...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Esquema actual</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
         <translation>Forzar estilo en todas las aplicaciones.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation>Desactivar estilo en estas aplicaciones (puede usarse el comodín &lt;b&gt;*&lt;/b&gt;):</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
         <translation>Ficheros binarios</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>Estilo pestañas:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Eestañas con iconos</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Lista donde soltar</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista donde soltar con iconos</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Abajo</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Ventanas</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzada</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Reiniciar</translation>
+        <translation type="obsolete">Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>¿Quiere reiniciar ahora?</translation>
+        <translation type="obsolete">¿Quiere reiniciar ahora?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sí</translation>
+        <translation type="obsolete">Sí</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>No</translation>
+        <translation type="obsolete">No</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Guardar Esquema</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Guardar esquema</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>El esquema ya existe.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Borrar esquema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Incapaz de borrar el esquema actual.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nuevo&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Los estilos controlan la forma en que elementos como los botones y barras de desplazamiento aparecen en todas las aplicaciones.
 
 Puse aquí para seleccionar un estilo disponible.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Pulse aquí para configurar el estilo seleccionado ahora.
 
 Nota: esta opción no está disponible en todos los estilos.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Las decoraciones de ventana controlan la apariencia del título de la aplicación y sus botones.
 
 Pulse aquí para seleccionar una decoración disponible.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Seleccione el nombre, estilo y tamaño de letra predeterminado que desea.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Los esquemas de color son una colección de colores que se usan en varias partes de la pantalla.
 
 Pulse aquí para seleccionar un esquema disponible.</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Pulse aquí para cambiar los colores del esquema de color actual.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Pulse aquí para borrar el esquema de color seleccionado en la lista de la izq.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Pulse aquí para nombrar y guardar el esquema de color actual.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
         <translation>Pulse aquí para permitir que todas las aplicaciones usen la configuración de apariencia global.</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
         <translation>Si algunas aplicaciones no se ven bien con la configuración de apariencia global, algunas características pueden desaparecer.
 
 Esta área le permite seleccionar un aplicación y qué funciones desea deshabilitar.</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
         <translation>Pulse aquí para añadir una aplicación de la lista superior.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
         <translation>Pulse aquí para borrar la aplicación seleccionada actualmente.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
         <translation>Pulse aquí para subir la aplicación seleccionada en la lista.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
         <translation>Pulse aquí para bajar la aplicación seleccionada en la lista.</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Pulse aquí para seleccionar un estilo para los diálogos con pestañas (como esta). Los estilos disponibles son:
 
 1. Pestañas - pestañas normales con sólo texto
 2. Pestañas con iconos - pestañas con iconos, el texto aparece solo en la actual
 3. Lista desplegable - una lista vertical de pestañas
 4. Lista desplegable con iconos - una lista vertical de pestañas con iconos</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Pulse aquí para que las pestañas aparezcan en la parte superior de la ventana.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Pulse aquí para que las pestañas aparezcan en la parte inferior de la ventana.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Esta en una ventana de previsualización. Vea la nueva apariencia mientras cambia las opciones.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Configuración de Apariencia</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Dirección de rotación:</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Seleccione aquí un color para: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Muestra</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Elemento normal</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Elemento desabilitado</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Texto norma</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Texto resaltado</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Botón</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Caja comprobar</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Ventana de muestra con la configuración seleccionada.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/calculator.ts b/i18n/es/calculator.ts
index 2067367..19e66ae 100644
--- a/i18n/es/calculator.ts
+++ b/i18n/es/calculator.ts
@@ -1,335 +1,335 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>Experimental Calculator</source>
         <translation>Calculadora Experimental</translation>
     </message>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sen</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
-        <translation>Calculadora</translation>
+        <translation type="obsolete">Calculadora</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>Estándar</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Estándar</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index 1c55e32..5d859ea 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -1,524 +1,754 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nueva chequera</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacciones</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Introduzca aquí el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleccione aquí el tipo de chequera.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Ahorros</translation>
+        <translation type="obsolete">Ahorros</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Comprobando</translation>
+        <translation type="obsolete">Comprobando</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Dinero mercado</translation>
+        <translation type="obsolete">Dinero mercado</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Fondo mutuo</translation>
+        <translation type="obsolete">Fondo mutuo</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Otro</translation>
+        <translation type="obsolete">Otro</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banco:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Introduzca aquí el banco de esta chequera.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Número cuenta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Introduzca aquí el nº de cuenta de esta chequera.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Introduzca aquí el nº PIN de esta chequera.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Balance inicial: </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Introduzca aquí el balance inicial de esta chequera.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Introduzca aquí culaquier información adicional de esta chequera.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Balance actual: %10.00</translation>
+        <translation type="obsolete">Balance actual: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>Esta área muestra el balance actual en esta chequera.</translation>
+        <translation type="obsolete">Esta área muestra el balance actual en esta chequera.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Ésta es una lista de todas las transacciones de esta chequera.
 
 Para ordenar las entradas por un campo específico, pulse el nombre de la columna.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Cantidad</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Pulse aquí para añadir una nueva transacción.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleccione una transacción y pulse aquí para editarla.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleccione el gráfico deseado y pulse el botón Dibujar.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Seleccione aquí el tipo de gráfico deseado.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Balance cuenta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retiradas por categoría</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depósitos por categoría</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dibujar</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Pulse aquí para dibujar el gráfico seleccionado.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>Balance actual: %1%2</translation>
+        <translation type="obsolete">Balance actual: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Borrar transacción</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Proteger con clave</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Pulse aquí para des/habilitar protección con clave de esta chequera.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirme clave</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Por favor, confirme su clave:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Por favor, introduzca su clave para deshabilitar la protección con clave:</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Balance</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurar Chequera</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Introduzca símbolo de la moneda:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Introduzca aquí su símbolo de moneda local.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostrar si la chequera está
 protegida con clave</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Pulse aquí para seleccionar si la ventana principal debe mostrar que la chequera está protegida con clave.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostrar balances chequera</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Pulse aquí para seleccionar si la ventana principal debe mostrar el balance actual para cada chequera.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Pulse aquí para crear una nueva chequera.
 
 Puede también seleccionar Nueva del menú.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleccione una chequera y pulse aquí para editarla.
 
 Puede también seleccionar Editar del menú, o mantener pulsado el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.
 
 Puede también seleccionar Borrar del menú.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Esta es una lista de todas las chequeras disponibles.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Borrar chequera</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nobre de la chequera</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Balance</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Fecha</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Ahorros</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Comprobando</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Dinero mercado</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Fondo mutuo</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Otro</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Automóvil</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Facturas</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CDs</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Ropa</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Ordenador</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVDs</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished">Electrónica</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Diversión</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Comida</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Combustible</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Varios</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Películas</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Alquiler</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Viaje</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Trabajo</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Miembro familiar</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Crédito misc</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transacción para </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Retirada</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleccione aquí si la transacción es un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleccione aquí la fecha de la transacción.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Introduzca aquí el nº del cheque.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Introduzca aquí la descripción de la transacción.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleccione aquí la categoría de la transacción.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleccione aquí el tipo de transacción.
 
 Las opciones disponibles varían según sea un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Cantidad:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí la cantidad de la transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tasa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí cualquier tasa asociada a esta transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Introduzca aquí cualquier información adicional de esta transacción.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Automóvil</translation>
+        <translation type="obsolete">Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Facturas</translation>
+        <translation type="obsolete">Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CDs</translation>
+        <translation type="obsolete">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Ropa</translation>
+        <translation type="obsolete">Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Ordenador</translation>
+        <translation type="obsolete">Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVDs</translation>
+        <translation type="obsolete">DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Diversión</translation>
+        <translation type="obsolete">Diversión</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Comida</translation>
+        <translation type="obsolete">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Combustible</translation>
+        <translation type="obsolete">Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Varios</translation>
+        <translation type="obsolete">Varios</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Películas</translation>
+        <translation type="obsolete">Películas</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Alquiler</translation>
+        <translation type="obsolete">Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Viaje</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">Trabajo</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Miembro familiar</translation>
+        <translation type="obsolete">Miembro familiar</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Crédito misc</translation>
+        <translation type="obsolete">Crédito misc</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pago automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Efectivo</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation>Electrónica</translation>
+        <translation type="obsolete">Electrónica</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 8e09036..b9969f1 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -1,840 +1,844 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Lista semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Duración de la cita más larga
 que el intervalo de repetición.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Editar cita</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutos)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Calendario es incapaz de
 salvar tus cambios.
 Libere espacio y vuelva a intentarlo.
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Desconocido)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>¡Error!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Arréglalo</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Cita duplicada</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>diálogo de error</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>Emitir esta aparición</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Comienzo de las citas</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora inicio:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Configuración de la alarma</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Prefijar alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Miscelánea</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo filas:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medianas</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grandes</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista preferida:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Lista semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Saltar a hora actual</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Visualización de la hora</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Inicio-fin</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Ene-00. Ene</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation type="obsolete">LMXJVSDL</translation>
+        <translation type="unfinished">LMXJVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">Ju</translation>
     </message>
     <message>
         <source>Fr</source>
         <comment>Friday</comment>
         <translation type="obsolete">Vi</translation>
     </message>
     <message>
         <source>Sa</source>
         <comment>Saturday</comment>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Su</source>
         <comment>Sunday</comment>
         <translation type="obsolete">Do</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetición...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Cada día...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Cada semana...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Cada mes...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Cada año...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>No repetir...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Hora inicio</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Hora fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nueva Cita</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lugar</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunión</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almuerzo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Cena</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaje</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Ene 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Hora inicio</translation>
+        <translation type="unfinished">Hora inicio</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona horaria</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silenciosa</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Audible</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetición</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>No repetir...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descripción </translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Inicio - Fin </translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">Hora inicio</translation>
+        <translation type="obsolete">Hora inicio</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almuerzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>El %1 %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>ª</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>ª</translation>
     </message>
     <message>
         <source>th</source>
         <translation>ª</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>Día(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mes(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>año(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>días</translation>
     </message>
     <message>
         <source>day</source>
         <translation>día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mes</translation>
     </message>
     <message>
         <source>year</source>
         <translation>año</translation>
     </message>
     <message>
         <source> and </source>
         <translation> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, y </translation>
     </message>
     <message>
         <source>on </source>
         <translation>en </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Cita Periódica </translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Terminar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sin final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mié</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>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>Var semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>years</source>
         <translation>años</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/doctab.ts b/i18n/es/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/es/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/filebrowser.ts b/i18n/es/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/es/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/gsmtool.ts b/i18n/es/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/es/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/kate.ts b/i18n/es/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/es/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/kpacman.ts b/i18n/es/kpacman.ts
index 959e492..2733df5 100644
--- a/i18n/es/kpacman.ts
+++ b/i18n/es/kpacman.ts
@@ -1,242 +1,246 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Predeterminados</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Cambiar teclas de dirección</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Tecla indefinida</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nuevo</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pausa</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Hall de la fama</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <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>KPacman</source>
         <translation>KPacman</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>CARÁCTER</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 EL CURSOR PARA EMPEZAR</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP </translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation> PUNTUACIÓ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   PTS   NOMBRE FECHA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></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/launchersettings.ts b/i18n/es/launchersettings.ts
index 1b26e47..e3f4f95 100644
--- a/i18n/es/launchersettings.ts
+++ b/i18n/es/launchersettings.ts
@@ -1,208 +1,270 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Configuración del Lanzador</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barra de tareas</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menú O</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Cargar applets en el Menú O:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostrar pestañas del lanzador en el Menú O</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Verificar los applets que quiere incluir en el Menú O.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Añadir el contenido de las pestañas del Lanzador como menú en el Menú O.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Muestra 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Muestra 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Muestra 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Pestaña Editar</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fondo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Inconos</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Vista previa %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Esta es una somera visión de como se verá la pestaña seleccionada.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usar una letra personalizada</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Reglado</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Color sólido</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Seleccionar...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predeterminado</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Tamaño:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeño</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Color:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Pestañas del Lanzador:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>barra tonta</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>Enable big busy indicator</source>
         <translation>Habilitar indicador de ocupado grande</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Habilitar indicador de ocupado parpadeante</translation>
+        <translation type="obsolete">Habilitar indicador de ocupado parpadeante</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Seleccione la pestaña del lanzador que quiere editar o borrar.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Añadir una nueva pestaña al Lanzador.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Abrir un nuevo diálogo para personalizar la pestaña seleccionada.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Borra una pestaña del Lanzador.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Active esto si quiere un gran indicador de ocupado en el medio de la pantalla en vez de el de la barra de tareas.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Active esto si quiere un indicador de ocupado parpadeante al iniciar aplicaciones en el Lanzador.</translation>
+        <translation type="obsolete">Active esto si quiere un indicador de ocupado parpadeante al iniciar aplicaciones en el Lanzador.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Todas las pestañas</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>No implementado todavía</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Cargar applets el la barra de tareas:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Compruebe los applets que quiere ver en la barra de tareas.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libclockapplet.ts b/i18n/es/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/es/libclockapplet.ts
+++ b/i18n/es/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/es/libfreetypefactory.ts b/i18n/es/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libliquid.ts b/i18n/es/libliquid.ts
index a124a27..f5bb58e 100644
--- a/i18n/es/libliquid.ts
+++ b/i18n/es/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Líquido</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Estilo Líquido</translation>
+        <translation type="unfinished">Estilo Líquido</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Sin transparencia</translation>
+        <translation type="unfinished">Sin transparencia</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Punteado, color de fondo</translation>
+        <translation type="unfinished">Punteado, color de fondo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Punteado, color de botón</translation>
+        <translation type="unfinished">Punteado, color de botón</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Punteado translúcido, color de fondo</translation>
+        <translation type="unfinished">Punteado translúcido, color de fondo</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Punteado translúcido, color de botón</translation>
+        <translation type="unfinished">Punteado translúcido, color de botón</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Transparencia propia</translation>
+        <translation type="unfinished">Transparencia propia</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Color del menú</translation>
+        <translation type="unfinished">Color del menú</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Color del texto</translation>
+        <translation type="unfinished">Color del texto</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Opacidad</translation>
+        <translation type="unfinished">Opacidad</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Usar texto del munú sombreado</translation>
+        <translation type="unfinished">Usar texto del munú sombreado</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Botones de barra de herramientas planos</translation>
+        <translation type="unfinished">Botones de barra de herramientas planos</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Contraste punteado</translation>
+        <translation type="unfinished">Contraste punteado</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Líquido</translation>
+        <translation type="unfinished">Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Estilo de alto rendimiento Liquid por Mosfet</translation>
+        <translation type="unfinished">Estilo de alto rendimiento Liquid por Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libmemoryapplet.ts b/i18n/es/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/es/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libmpeg3plugin.ts b/i18n/es/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/liboapp.ts b/i18n/es/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libopie.ts b/i18n/es/libopie.ts
index 328e2dd..b53ef57 100644
--- a/i18n/es/libopie.ts
+++ b/i18n/es/libopie.ts
@@ -1,659 +1,859 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Botón Calendario</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Botón Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Botón Menú</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Botón Correo</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Botón Inicio</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Botón Grabación</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Rotación de la pantalla</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Minúscula+Arriba</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Minúscula+Abajo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Minúscula+Derecha</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Minúscula+Izquierda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Mayúscula+Arriba</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Mayúscula+Abajo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Mayúscula+Derecha</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Mayúscula+Izquierda</translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Saturación:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Valor:</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 alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Seleccione color</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Más</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Más...</translation>
+        <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <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>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Mediana</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeña</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 Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir el</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>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>VarSemana</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation>días</translation>
     </message>
     <message>
         <source>day</source>
         <translation>día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation>años</translation>
     </message>
     <message>
         <source>year</source>
         <translation>año</translation>
     </message>
     <message>
         <source> and </source>
         <translation> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, y </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir el</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>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation>en </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Tomar hora:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos los ficheros</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fecha lí­mite:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Correo-e preferido: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Oficina: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web trabajo: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Busca trabajo: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Página web personal: </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>All Emails: </source>
         <translation>Todos correos-e: </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>Children: </source>
         <translation>Hijos: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apodo: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localidad: </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Esta cita dura todo el día</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Esta cita dura varios días</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Final:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>El %1 %2 de cada</translation>
     </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>th</source>
         <translation>º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopiecore2.ts b/i18n/es/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/es/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libopiedb2.ts b/i18n/es/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libopiemm2.ts b/i18n/es/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libopiepim2.ts b/i18n/es/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libopieui2.ts b/i18n/es/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libqdasher.ts b/i18n/es/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/es/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index 69ae925..8cc20ab 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -1,973 +1,961 @@
 <!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>Trabajo</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>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>
 </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>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>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>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>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>
     <message>
         <source>Use custom rotation</source>
         <translation>Usar rotación personalizada</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>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>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</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>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">¿Seguro que quiere borrar
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</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>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 personal: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Web personal: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web trabajo: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Oficina: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Busca trabajo: </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>2º nombre</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apellidos</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar 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 trabajo</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax trabajo</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Móvil trabajo</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Correo-e omisión</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 personal</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Calle trabajo</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>CP trabajo</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País trabajo</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Busca trabajo</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web trabajo</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.portal 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>
     <message>
         <source>New Document</source>
         <translation>Nuevo documento</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>Click to close this window, discarding changes.</source>
         <translation>Pulse para cerrar esta ventana, descartando los cambios.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Pulse para cerrar esta ventana.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Pulse para cerrar esta ventana y aplicar los cambios.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Pulse para hacer esta ventana móvil.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;No se dispone de ayuda exhaustiva para esta aplicación, sin embargo hay ayuda sensible al contexto.&lt;p&gt;Para usar esta ayuda:&lt;p&gt;&lt;ol&gt;&lt;li&gt;mantenga pulsado el botón de ayuda.&lt;li&gt;cuando la barra de título muestre &lt;b&gt;Qué es esto...&lt;/b&gt;, pulse en cualquier control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Qué es esto...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;¿Seguro que quiere borrar
 %1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Ene</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>May</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Error</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Tarjeta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Tarjeta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco duro SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Almacenamiento interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Tarjeta MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>no encontré el ejecutable Reloj Mundial</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Para elegir las zonas horarias, por favor
 instale el Reloj Mundial (citytime).</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e inténtelo de nuevo</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 ficheros</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos los %1 ficheros</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos los ficheros</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/librestartapplet.ts b/i18n/es/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libtinykate.ts b/i18n/es/libtinykate.ts
index 3e8871a..5f14ff1 100644
--- a/i18n/es/libtinykate.ts
+++ b/i18n/es/libtinykate.ts
@@ -1,24 +1,977 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></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
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Ha habido un problema creando
 la información de configuración de
 Kate para este programa.
 
 Por favor, libere algo de especio
 e inténtelo de nuevo.
 </translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libtodayaddressbookplugin.ts b/i18n/es/libtodayaddressbookplugin.ts
index d2824b6..c38da0c 100644
--- a/i18n/es/libtodayaddressbookplugin.ts
+++ b/i18n/es/libtodayaddressbookplugin.ts
@@ -1,94 +1,114 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Máx líneas:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Fija el número máximo de líneas que se mostrarán en cada aniversario/cumpleaños</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Cortar línea tras X caracteres: </translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Después de cuantos caracteres la información sobre la tarea debe ser cortada</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Dias siguientes: </translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Cuantos días después debemos buscar</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Para activar configuración: ¡Reinicie la aplicación!</translation>
+        <translation type="unfinished">Para activar configuración: ¡Reinicie la aplicación!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Fijar color cabecera: </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>¡Colores de las cabeceras!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Fijar color de entrada: </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>¡Este color será usado al mostrar cumpleaños/aniversarios!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Fijar urgente
 Color si debajo</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>Días: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>¡Este color urgente será usado si estamos cerca de la cita!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>¡El color urgente será usado si el cumpleaños/aniversario está más próximo que los días dados!</translation>
     </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Módulo LibretaDirecciones</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos aniversarios en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin aniversarios en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>¡La base de datos no facilita esta petición de búsqueda! ¡Por favor, actualice libOpie!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libvtapplet.ts b/i18n/es/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/es/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/light-and-power.ts b/i18n/es/light-and-power.ts
index 1711aed..43e35ec 100644
--- a/i18n/es/light-and-power.ts
+++ b/i18n/es/light-and-power.ts
@@ -1,151 +1,170 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 pasos</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Un sensor de luz ambiental ajusta automáticamente la iluminación de la pantalla. La configuración del brillo aún afecta el brillo medio.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Bajar luz tras</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender tras</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Sin luz tras</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Apagada</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation>Configuración de Luz y Energía</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>en batería</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>Configuración General</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>Sólo desactivar LCD (no suspender)</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>Retroiluminación</translation>
     </message>
     <message>
         <source>set a fix value for backlight</source>
         <translation>fije un valor de iluminación</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Completa</translation>
     </message>
     <message>
         <source>Use Light Sensor</source>
         <translation>Usar sensor de luz</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>Calibrar</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>Configuración avanzada del sensor de luz</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>enchufada</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>Avisos</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>Intervalo de aviso</translation>
     </message>
     <message>
         <source> %</source>
         <translation> %</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>A qué nivel de batería debe saltar el aviso de baja energía</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>con qué frecuencia debe ser verificada la energía. Esto determina el ritmo al que aparecerán los avisos</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>A qué nivel de batería debe saltar el aviso de nivel crítico</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>Aviso de batería muy baja al</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>Aviso de nivel crítico al</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>Calibración del Sensor</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Completa</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Apagada</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>Oscuro</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>Claro</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>Pasos</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>Verificar intervalo</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> seg</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/mobilemsg.ts b/i18n/es/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/es/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/oipkg.ts b/i18n/es/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/es/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/op-qws.ts b/i18n/es/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/es/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/opie-login.ts b/i18n/es/opie-login.ts
index 9ba6f1c..3ed76f7 100644
--- a/i18n/es/opie-login.ts
+++ b/i18n/es/opie-login.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pulse las cruces 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>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Ingreso</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Bienvenido a Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Contraseña incorrecta</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>La contraseña es incorrecta.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">Opie ha terminado por
 una señal no capturada
 (%1)
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">No pude iniciar Opie.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>No pude pasar a la nueva identidad de usuario</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie fue terminado por
 una señal no capturada
 (%1)
 </translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>No pude iniciar Opie.</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/opierec.ts b/i18n/es/opierec.ts
index f2e0470..7a1a2ee 100644
--- a/i18n/es/opierec.ts
+++ b/i18n/es/opierec.ts
@@ -1,212 +1,220 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>Atrás</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Adelante</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>Grabadora Opie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Tasa muestreo</translation>
     </message>
     <message>
         <source>44100</source>
         <translation>44100</translation>
     </message>
     <message>
         <source>32000</source>
         <translation>32000</translation>
     </message>
     <message>
         <source>22050</source>
         <translation>22050</translation>
     </message>
     <message>
         <source>16000</source>
         <translation>16000</translation>
     </message>
     <message>
         <source>11025</source>
         <translation>11025</translation>
     </message>
     <message>
         <source>8000</source>
         <translation>8000</translation>
     </message>
     <message>
         <source>Limit Size</source>
         <translation>Tamaño límite</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Ilimitado</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Directorio archivo</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Bits de muestreo</translation>
     </message>
     <message>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>In</source>
         <translation>Entrada</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
         <source>Low Disk Space</source>
         <translation>Poco espacio en disco</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Está grabando con poco
 espacio, o una tarjeta
 no ha sido reconocida</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>segundos</translation>
     </message>
     <message>
         <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
 the selected file?</source>
         <translation>¿Seguro que quiere &lt;font size=+2&gt;&lt;B&gt;borrar&lt;/B&gt;&lt;/font&gt;
 el fichero seleccionado?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>No pude borrar el fichero.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opierec</translation>
     </message>
     <message>
         <source>Please select file to  play</source>
         <translation>Por favor, seleccione el fichero a reproducir</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>No pude abrir el fichero de audio.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Enviar por IR</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Emitir por IR</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Enviado por IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation>Gra</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lugar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Compresión de onda (ocupa menos)</translation>
     </message>
     <message>
         <source>auto Mute</source>
-        <translation>Mudo auto</translation>
+        <translation type="obsolete">Mudo auto</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>mudo</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
+    <message>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/ordesktop.ts b/i18n/es/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/osearch.ts b/i18n/es/osearch.ts
index 474e393..3585b19 100644
--- a/i18n/es/osearch.ts
+++ b/i18n/es/osearch.ts
@@ -1,143 +1,147 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>Buscador O</translation>
     </message>
     <message>
         <source>adressbook</source>
         <translation type="obsolete">contactos</translation>
     </message>
     <message>
         <source>todo</source>
         <translation type="obsolete">tareas</translation>
     </message>
     <message>
         <source>datebook</source>
         <translation type="obsolete">calendario</translation>
     </message>
     <message>
         <source>applications</source>
         <translation type="obsolete">aplicaciones</translation>
     </message>
     <message>
         <source>documents</source>
         <translation type="obsolete">documentos</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Buscar todo</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>Sensible may/min</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>Usar comodines</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Los detalles del resultado actual</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Introduzca aquí sus términos de búsqueda</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>mostrar</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>editar</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>abrir en el Gestor de Ficheros</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>abrir con</translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation>mostrar tareas completadas</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>mostrar sucesos pasados</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>buscar en fechas</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Fichero: </translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Enlace: </translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Tipo MIME: </translation>
     </message>
     <message>
         <source>search content</source>
         <translation>buscar contenido</translation>
     </message>
     <message>
         <source>searching %1</source>
         <translation>buscando %1</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index c2663ef..525b0f7 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,490 +1,518 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&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 type="unfinished">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&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 type="obsolete">&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 type="obsolete">Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="obsolete">Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Ver como lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">La batería está muy baja.</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">¡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 type="obsolete">La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">tarjeta de visita</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Estado de la Batería</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Lanzador</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">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 type="unfinished">&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documentos</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Ver como lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 ficheros</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Todos los tipos de ficheros</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Ver como documentos</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Medio insertado</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Vídeo</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Enlace a aplicaciones</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limitar búsqueda al directorio: (no se usa aún)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Añadir</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Su decisión será guardada en el medio.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">No preguntar otra vez por este medio</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Estado de la Batería</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">¡El nivel de la batería es crítico!
+        <translation type="obsolete">¡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 type="unfinished">La batería de respaldo está muy baja.
+        <translation type="obsolete">La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">tarjeta de visita</translation>
     </message>
     <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Terminar Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Reiniciar</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">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 type="unfinished">&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>Shutdown...</source>
         <translation type="unfinished">Apagar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Conexión de sincronización</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Denegar</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">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 type="unfinished">&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>
+        <translation type="obsolete">&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 type="unfinished">&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>&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 or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Sincronizando</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/quicklauncher.ts b/i18n/es/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index 4702b56..d5a9334 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -1,118 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Fijar código</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introducir código</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Código Incorrecto</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>El código introducido es incorrecto.
 Acceso denegado</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Teclee nuevo código</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Reintroduzca nuevo código</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Configuración de Seguridad</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Borrar código</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Solicitar código al encender</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Sincronización desde red:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (predefinido)</translation>
+        <translation type="obsolete">192.168.129.0/24 (predefinido)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Cualquiera</translation>
+        <translation type="obsolete">Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Ninguna</translation>
+        <translation type="obsolete">Ninguna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Código</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Identificación</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Identificación automática</translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/showimg.ts b/i18n/es/showimg.ts
index dea5560..3348e69 100644
--- a/i18n/es/showimg.ts
+++ b/i18n/es/showimg.ts
@@ -1,188 +1,185 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation>Brillo</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Visor de Imágenes</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Espejo horizontal</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Espejo vertical</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rotar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rotar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Visor de imágenes</translation>
     </message>
     <message>
         <source> True color</source>
         <translation> Color verdadero</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Ver miniaturas</translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation>Preferencias..</translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation>Info imagen ...</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>Abrir ...</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>Rotar 270º</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>Brillo ...</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>Blanco y negro</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation>Ajustar a la pantalla</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 colores</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 niveles alpha</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>canal alpha de 8 bits</translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation>Secuencia</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation>Fin secuencia</translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>Secuencia</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>Lapso entre imágenes</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>Repetir secuencia</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Mostrar imágenes al revés</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Cargar imágenes rotadas 90º</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>Carga rápida de imágenes</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sound.ts b/i18n/es/sound.ts
index 2a7dba8..ae3d0e7 100644
--- a/i18n/es/sound.ts
+++ b/i18n/es/sound.ts
@@ -1,128 +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_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>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index 94df81d..bd63585 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -1,298 +1,325 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Este gráfico representa la memoria usada actualmente es esta tarjeta de memoria Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation>Este gráfico representa el almacenamiento usado en este disco duro.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation>Este gráfico representa cuanta memoria se usa actualmente en esta tarjeta Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>En</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Este gráfico representa cuanta memoria se usa actualmente de la memoria incorporada (p.e. Flash) en este dispositivo.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Este gráfico representa cuánta memoria usa actualmente el disco RAM temporal.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uso de CPU por la aplicación (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uso de CPU por el sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Esta página muestra el procesador que está siendo usado.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Está página muestra cuanta memoria (p.e. RAM) está siendo asignada.
+        <translation type="obsolete">Está página muestra cuanta memoria (p.e. RAM) está siendo asignada.
 La memoria se cataloga como sigue:
 
 1. Usada - memoria usada por Opie y cualquier aplicación en ejecución.
 2. Buffers - almacenamiento temporal usada para mejorar el rendimiento.
 3. Cached - información usada recientemente, pero aún no liberada.
 4. Libre - memoria actualmente no usada por ninguna aplicación.</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uso#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Usado por</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta es una lista de todos los módulos del kernel actualmente cargados.
 
 Mantenga pulsado un módulo para ver información adicional sobre el módulo, o descargarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione un comando aquí y luego pulse el botón Enviar de la derecha para que lo reciba el módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Pulse aquí para enviar el comando selecciondo al módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Seguro que quiere ejecutar
 </translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta área muestra información detallada sobre este módulo.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Usado por</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation>¿Seguro que quiere ejecutar %1 para este módulo?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tiempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Esta es una lista de todos los procesos de este dispositivo.
 
 Mantenga pulsado un proceso para ver información adicional, o para enviarle una señal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Seleccione aquí una señal y luego pulse el botón Enviar de la derecha para enviárselo a este proceso.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Pulse aquí para enviar la señal seleccionada a este proceso.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Esta área muestra información detallada sobre este proceso.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Seguro que quiere enviar
 </translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation>¿Seguro que quiere enviar %1 a este proceso?</translation>
+        <translation type="obsolete">¿Seguro que quiere enviar %1 a este proceso?</translation>
+    </message>
+    <message>
+        <source>Really want to send %1
+to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Información del Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Almacenamiento</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Fecha compilación: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Modelo: </translation>
+        <translation type="obsolete">&lt;p&gt;Modelo: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Proveedor: </translation>
+        <translation type="obsolete">&lt;p&gt;Proveedor: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Esta página muestra la versión actual de Opie, del kernel Linux y de la distribución corriendo es este dispositivo.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/taboapp.ts b/i18n/es/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/tictac.ts b/i18n/es/tictac.ts
index 29fdca9..c1ab3c0 100644
--- a/i18n/es/tictac.ts
+++ b/i18n/es/tictac.ts
@@ -1,48 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>TicTac</translation>
+        <translation type="obsolete">TicTac</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Empieza el ordenador</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Empieza el humano</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Juegar!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Pulsa Jugar para empezar</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Haz tu movimiento</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>¡Tú ganas!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>¡El ordenador gana!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Empate</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index 75e2b01..c7d2fcb 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -1,182 +1,182 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Hoy</translation>
+        <translation type="obsolete">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 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>Hoy</translation>
     </message>
     <message>
         <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&#xdf;</source>
         <translation>Hoy por Maximilian Reiß</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <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>minutes inactive</source>
         <translation type="obsolete">minutos inactivo</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="obsolete">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 type="obsolete">Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
     </message>
     <message>
         <source>Icon size</source>
         <translation type="obsolete">Tamaño del icono</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="obsolete">Fijar el tamaño del icono en pixel</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="obsolete">¿Arrancar
 al encender?
 (sólo Opie)</translation>
     </message>
     <message>
         <source>Refresh</source>
         <translation type="obsolete">Actualizar</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="obsolete">Con qué frecuencia debe Hoy actualizarse</translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="obsolete"> seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation type="obsolete">nunca</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Pulse en las casillas para activar un módulo o use los botones de desplazamiento para cambiar el orden de aparición</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Configuración de Hoy</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</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>autostart on resume?</source>
         <translation>¿arrancar al encender?</translation>
     </message>
     <message>
         <source>tiny banner</source>
         <translation>mini-avisos</translation>
     </message>
     <message>
         <source>Have small banner </source>
         <translation>Tiene aviso pequeño</translation>
     </message>
     <message>
         <source> min</source>
         <translation>min</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>minutes inactive</source>
         <translation>minutos inactivo</translation>
     </message>
     <message>
         <source> pixel</source>
         <translation>pixel</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Fijar el tamaño del icono en pixel</translation>
     </message>
     <message>
         <source>icon size</source>
         <translation>tamaño del icono</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation>Con qué frecuencia debe Hoy actualizarse</translation>
     </message>
     <message>
         <source>refresh</source>
         <translation>actualizar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index 4f6a9d4..ad0e93a 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -1,620 +1,624 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarma en %1&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Alarmas</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Repetición</translation>
     </message>
     <message>
         <source>Task Editor</source>
         <translation>Editor de tarear</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Enter Task</source>
         <translation>Introducir Tarea</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>silenciosa</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>sonora</translation>
     </message>
     <message>
         <source>Opie Todolist</source>
         <translation>Tareas Opie</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation>Nuevo desde plantilla</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>Nueva tarea</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation>Pulse aquí para crear una nueva tarea.</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation>Pulse aquí para modificar la tarea actual.</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>Eliminar...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation>Pulse aquí para borrar la tarea actual.</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>Borrar todo...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Borrado completado</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation>Pulse aquí para enviar la tarea actual a otro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Mostrar tareas completadas</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Mostrar sólo tareas fuera de fecha</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Mostrar fecha límite</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Mostrar barra de tareas rápida</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>QuickEdit</source>
         <translation>EditorRápido</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Este es un listado de todas las tareas actuales:
 
 La lista muestra la siguiente información:
 1. Completada - una marca verde indica tarea finalizada. Pulse aquí para completar una tarea.
 2. Prioridad - una representación gráfica de la prioridad de una tarea. Haga un click doble aquí para modificarla.
 3. Descripción - descripción de la tarea. Pulse aquí para seleccionar la tarea.
 4. Fecha límite - muestra cuando vence una tarea. Esta columna puede mostrarse o esconderse en las opciones del menú.</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 type="obsolete">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>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descripción</translation>
+        <translation type="obsolete">Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Configurar Platillas</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <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>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nueva plantilla %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para fijar la prioridad de la nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Introduzca aquí la descripción de la nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Más</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para introducir información adicional en una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Introducir</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para añadir una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para reiniciar la información de una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Introduzca aquí una breve descripción de la tarea.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Completar </translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>En marcha </translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Comprar </translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organizar </translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Conseguir </translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Actualizar </translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Crear </translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planificar </translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Llamar </translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Seleccione aquí la prioridad de la tarea.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Seleccione la categoría con la que organizar esta tarea.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Tarea repetitiva</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Pulse aquí si la tarea ocurre regularmente. Si lo selecciona, la frecuencia puede fijarse en la etiqueta Repetición.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Introduzca aquí cualquier información adicional sobre esta tarea.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista de Tareas</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Sumario:</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Pulse aquí para fijar el estado actual de esta tarea.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniciada</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Pospuesta</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Finalizada</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>No iniciada</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Seleccione aquí el progreso hecho es esta tarea.</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>
     <message>
         <source>Start Date:</source>
         <translation>Fecha inicio:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Pulse aquí para fijar la fecha en la que fue empezada esta tarea.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Fecha vencimiento:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Pulse aquí para fijar la fecha en la que esta tarea necesita estar completada.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Completada:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Pulse aquí para marcar esta tarea como completada.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Pulse aquí para fijar la fecha en la que esta tarea se completó.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Modo mantenedor:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Pulse aquí para fijar el papel de mantenedor.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Hecho por</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinador</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Mantenedor:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Este es el nombre del mantenedor actual de la tarea.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Pulse aquí para seleccionar mantenedor de la tarea.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/tonleiter.ts b/i18n/es/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/es/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/zsafe.ts b/i18n/es/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/es/zsafe.ts
+++ b/i18n/es/zsafe.ts
@@ -1,529 +1,814 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>