8 files changed, 376 insertions, 154 deletions

diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 714329b..7e2167d 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -163,24 +163,36 @@ no termina en ".vcf".
         <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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></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>
@@ -316,24 +328,44 @@ suministra gratis!</translation>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></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>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index d4959e1..973897f 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -37,28 +37,24 @@
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Pasar a local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Pasar a remoto</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>Acerca de</translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
@@ -167,35 +163,24 @@
         <source>to
 </source>
         <translation>a
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>No puede mover
 </translation>
     </message>
     <message>
-        <source>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL
-</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Añadir a Documentos</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
@@ -206,28 +191,24 @@ de los ficheros %1?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>¿Borrar directorio?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation>Confirme borrado
 </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>
@@ -239,24 +220,53 @@ existe. ¿Lo sobrescribo?</translation>
 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 type="unfinished">Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL
+</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</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>
 </context>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 9852cea..c1b590e 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -218,24 +218,28 @@ Esta área le permite seleccionar un aplicación y qué funciones desea deshabil
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Pulse aquí para que las etiquetas 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 type="unfinished"></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>
diff --git a/i18n/es/aqpkg.ts b/i18n/es/aqpkg.ts
index f66b971..fcf49bc 100644
--- a/i18n/es/aqpkg.ts
+++ b/i18n/es/aqpkg.ts
@@ -1,113 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation>Filtro de Categorías</translation>
+        <translation type="unfinished">Filtro de Categorías</translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
-        <translation>Seleccione grupos a mostrar</translation>
+        <source>Select one or more groups</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Leyendo configuración...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
-        <translation>Instalar</translation>
+        <source>Close</source>
+        <translation>Cerrar</translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation>Empezar</translation>
+        <source>Remove
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>Opciones</translation>
+        <source>Install
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
-        <translation>Salida</translation>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation>Destino</translation>
+        <translation type="unfinished">Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>Espacio disponible</translation>
+        <translation type="unfinished">Espacio disponible</translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
-        <translation>Cerrar</translation>
+        <source>Output</source>
+        <translation type="unfinished">Salida</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Empezar</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">Opciones</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation>Opciones</translation>
+        <translation type="unfinished">Opciones</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation>Forzar dependencias</translation>
+        <translation type="unfinished">Forzar dependencias</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation>Forzar reinstalar</translation>
+        <translation type="unfinished">Forzar reinstalar</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation>Forzar borrar</translation>
+        <translation type="unfinished">Forzar borrar</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation>Forzar sobreescribir</translation>
+        <translation type="unfinished">Forzar sobreescribir</translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
-        <translation>WGet detallado</translation>
+        <source>Information Level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
-        <translation>Ok</translation>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestor de Paquetes</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Escriba aquí el texto a buscar.</translation>
     </message>
@@ -219,44 +268,24 @@
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>Ayuda</translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation>Pulse aquí si busca ayuda.</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation>Sobre</translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation>Pulse aquí para la información de versión del software.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Opciones</translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Pulse aquí para esconder la barra de búsqueda.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Pulse aquí para seleccionar una fuente de paquetes.</translation>
     </message>
     <message>
@@ -271,28 +300,24 @@ A blue dot next to the package name indicates that the package is currently inst
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Ésta es una lista de todos los paquetes del servidor selecionado arriba.
 
 Un punto azul junto al nombre del paquete indica que está instalado actualmente.
 
 Un punto azul con una estrella indica que hay una versión más moderna disponible.
 
 Pulse en el recuadro de la izquierda para seleccionar un paquete.</translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation>Sobre AQPkg</translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Pulse aquí para desinstalar los paquetes seleccionados.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista del servidor:
 <byte value="x9"/>%1</translation>
@@ -425,97 +450,97 @@ Opie/Qtopia está corriendo!
 %1?</source>
         <translation>¿Desea borrar o actualizar
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Borrar o actualizar</translation>
     </message>
     <message>
         <source>U</source>
         <translation>U</translation>
     </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation>Configuración</translation>
+        <translation type="unfinished">Configuración</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation>Servidores</translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation>Servidor activo</translation>
+        <translation type="unfinished">Servidores</translation>
     </message>
     <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
+        <source>Destinations</source>
+        <translation type="unfinished">Destinos</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Proxies</source>
+        <translation type="unfinished">Proxies</translation>
     </message>
     <message>
-        <source>Change</source>
-        <translation>Cambiar</translation>
+        <source>New</source>
+        <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation>Nuevo</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Destinations</source>
-        <translation>Destinos</translation>
+        <source>Name:</source>
+        <translation type="unfinished">Nombre:</translation>
     </message>
     <message>
-        <source>Link To Root</source>
-        <translation>Enlazar a raíz</translation>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxies</source>
-        <translation>Proxies</translation>
+        <source>Active Server</source>
+        <translation type="unfinished">Servidor activo</translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
-        <translation>Proxy HTTP</translation>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Clave</translation>
+        <source>Destination</source>
+        <translation type="unfinished">Destino</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>Habilitada</translation>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
-        <translation>Proxy FTP</translation>
+        <source>Link to root</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
-        <translation>Nombre usuario</translation>
+        <source>HTTP Proxy</source>
+        <translation type="unfinished">Proxy HTTP</translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
-        <translation>&amp;Aplicar</translation>
+        <source>Enabled</source>
+        <translation type="unfinished">Habilitada</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>FTP Proxy</source>
+        <translation type="unfinished">Proxy FTP</translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
-        <translation>(tendrá efecto al reiniciar)</translation>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
-        <translation>Mostrar salto a letras</translation>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 0451ed3..9cf0610 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -33,32 +33,24 @@
         <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>Alarm and Start Time...</source>
-        <translation>Alarma y hora comienzo...</translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation>Vista por omisión</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>
@@ -97,24 +89,28 @@ Libere espacio y vuelva a intentarlo.
     <message>
         <source>Fix it</source>
         <translation>Arréglalo</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
@@ -269,36 +265,83 @@ Libere espacio y vuelva a intentarlo.
         <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>Jump to current time (dayview)</source>
-        <translation>Saltar a la hora actual (vista día)</translation>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Día</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished">Semana</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished">Mes</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Nada</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">Inicio</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation type="unfinished"></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>week</source>
+        <translation type="unfinished">semana</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Y: </source>
         <translation>A: </translation>
     </message>
     <message>
         <source>W: </source>
         <translation>S: </translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Ene-00. Ene</translation>
diff --git a/i18n/es/drawpad.ts b/i18n/es/drawpad.ts
index c36b0a7..ac34248 100644
--- a/i18n/es/drawpad.ts
+++ b/i18n/es/drawpad.ts
@@ -97,32 +97,24 @@
         <source>Pen Width</source>
         <translation>Ancho lápiz</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Color lápiz</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Color relleno</translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation>Pizarra</translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation>Página</translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation>Insertar texto</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Ver miniaturas</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Ver miniaturas...</translation>
     </message>
     <message>
@@ -154,24 +146,100 @@ página actual?</translation>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>¿Quiere borrar la
 página actual?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>¿Quiere borrar todas
 las páginas?</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Selección de páginas</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
@@ -286,34 +354,34 @@ las páginas?</translation>
     <message>
         <source>Width:</source>
         <translation>Ancho:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Alto:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
-        <translation>Título:</translation>
+        <source>Title: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
-        <translation>Dimensión:</translation>
+        <source>Dimension: %1x%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
-        <translation>Fecha:</translation>
+        <source>Date: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Insertar texto</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
@@ -339,14 +407,34 @@ página seleccionada?</translation>
         <translation>No</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Borrar página</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>¿Quiere borrar la
 página seleccionada?</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libbatteryapplet.ts b/i18n/es/libbatteryapplet.ts
index dd9ca8d..f7bcc7e 100644
--- a/i18n/es/libbatteryapplet.ts
+++ b/i18n/es/libbatteryapplet.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation>Estado Batería</translation>
-    </message>
-    <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Cargando</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Porcentaje batería restante</translation>
     </message>
     <message>
@@ -48,14 +44,42 @@
     <message>
         <source>Power on-line</source>
         <translation>Alimentación conectada</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Alimentación externa desconectada</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Duración batería restante</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index f20c0f9..38b016f 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -340,28 +340,24 @@ editando las categorías.</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Información del propietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>Impreso1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>